Mercurial > bmsapp / changeset

changeset

Some final changes for now.

Sat, 21 Jan 2023 16:18:37 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Sat, 21 Jan 2023 16:18:37 +0100
changeset 469
a022701d47f5
parent 468
b21da6f583be
child 470
1eeaa281b62e

Some final changes for now.

src/EditProduct.cpp file | annotate | diff | comparison | revisions
src/EditProduct.h file | annotate | diff | comparison | revisions
src/EditProductTab13.cpp file | annotate | diff | comparison | revisions
translations/bmsapp_en.ts file | annotate | diff | comparison | revisions
translations/bmsapp_nl.ts file | annotate | diff | comparison | revisions 
--- a/src/EditProduct.cpp	Sat Jan 21 14:27:10 2023 +0100
+++ b/src/EditProduct.cpp	Sat Jan 21 16:18:37 2023 +0100
@@ -770,6 +770,8 @@
     connect(ui->downloadImage, SIGNAL(clicked()), this, SLOT(downloadImage_clicked()));
     connect(ui->printImage, SIGNAL(clicked()), this, SLOT(printImage_clicked()));
     connect(ui->filmStrip, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(selectImage_clicked(QListWidgetItem *)));
+    connect(ui->image_typeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::pictype_changed);
+    connect(ui->image_commentEdit, &QLineEdit::editingFinished, this, &EditProduct::piccomment_changed);
 
     setStage();
 
--- a/src/EditProduct.h	Sat Jan 21 14:27:10 2023 +0100
+++ b/src/EditProduct.h	Sat Jan 21 16:18:37 2023 +0100
@@ -266,6 +266,8 @@
     void downloadImage_clicked();
     void printImage_clicked();
     void selectImage_clicked(QListWidgetItem *);
+    void pictype_changed(int val);
+    void piccomment_changed();
 
     /* Modified progress bars */
     void ferment_perc_mash_valueChanged(int value);
--- a/src/EditProductTab13.cpp	Sat Jan 21 14:27:10 2023 +0100
+++ b/src/EditProductTab13.cpp	Sat Jan 21 16:18:37 2023 +0100
@@ -41,7 +41,7 @@
 	QSqlQuery query;
 
 	qDebug() << "  loading data";
-	query.prepare("SELECT * FROM products_pics WHERE uuid=:uuid");
+	query.prepare("SELECT * FROM products_pics WHERE uuid=:uuid ORDER BY record");
 	query.bindValue(":uuid", product->uuid);
 	query.exec();
 
@@ -77,7 +77,6 @@
     }
     images_Main(product->images_current);
 
-	// If any, show picture 1
 	// Stop spinner
 }
 
@@ -97,8 +96,8 @@
 
 	QPixmap outPixmap = QPixmap();
 	outPixmap.loadFromData(product->images_list.at(i).pic_data);
-	qDebug() << "  " << outPixmap.width() << "x" << outPixmap.height() << "size" << outPixmap.size() << product->images_list.at(i).filename;
-	qDebug() << "  " << ui->filmStrip->iconSize();
+//	qDebug() << "  " << outPixmap.width() << "x" << outPixmap.height() << "size" << outPixmap.size() << product->images_list.at(i).filename;
+//	qDebug() << "  " << ui->filmStrip->iconSize();
 	if (outPixmap.width() > 240 || outPixmap.height() > 180)
 	    newItem->setIcon(QIcon(outPixmap.scaled(240, 180, Qt::KeepAspectRatio, Qt::SmoothTransformation)));
 	else
@@ -119,6 +118,8 @@
     ui->printImage->setEnabled((product->images_count > 0) ? true:false);
     ui->delImage->setEnabled((product->images_count > 0) ? true:false);
 
+    const QSignalBlocker blocker1(ui->image_typeEdit);
+
     if (product->images_count < 1) {
 	ui->image_filenameEdit->setText("");
 	ui->image_timestampEdit->setText("");
@@ -341,3 +342,50 @@
     }
 }
 
+
+void EditProduct::pictype_changed(int val)
+{
+    qDebug() << "pictype_changed" << val;
+
+    product->images_list[ui->filmStrip->currentRow()].pic_type = val;
+
+    QSqlQuery query;
+    query.prepare("UPDATE products_pics SET pic_type=:pic_type WHERE record=:record");
+    query.bindValue(":pic_type", val);
+    query.bindValue(":record", product->images_list.at(ui->filmStrip->currentRow()).record);
+    query.exec();
+
+    if (query.lastError().isValid()) {
+        qWarning() << "pictype_changed()" << query.lastError();
+        QMessageBox::warning(this, tr("Database error"), tr("MySQL error: %1\n%2\n%3")
+                .arg(query.lastError().nativeErrorCode()).arg(query.lastError().driverText()).arg(query.lastError().databaseText()));
+    }
+
+    images_Thumbnails();
+}
+
+
+void EditProduct::piccomment_changed()
+{
+    qDebug() << "piccomment_changed" << ui->image_commentEdit->text();
+
+    product->images_list[ui->filmStrip->currentRow()].pic_comment = ui->image_commentEdit->text();
+
+    QSqlQuery query;
+    qDebug() << "piccomment_changed 0";
+    query.prepare("UPDATE products_pics SET pic_comment=:pic_comment WHERE record=:record");
+    query.bindValue(":pic_comment", ui->image_commentEdit->text());
+    query.bindValue(":record", product->images_list.at(ui->filmStrip->currentRow()).record);
+    qDebug() << "piccomment_changed 1";
+    query.exec();
+    qDebug() << "piccomment_changed 2";
+
+    if (query.lastError().isValid()) {
+        qWarning() << "pictype_changed()" << query.lastError();
+        QMessageBox::warning(this, tr("Database error"), tr("MySQL error: %1\n%2\n%3")
+                .arg(query.lastError().nativeErrorCode()).arg(query.lastError().driverText()).arg(query.lastError().databaseText()));
+    }
+    qDebug() << "piccomment_changed 3";
+}
+
+
--- a/translations/bmsapp_en.ts	Sat Jan 21 14:27:10 2023 +0100
+++ b/translations/bmsapp_en.ts	Sat Jan 21 16:18:37 2023 +0100
@@ -4171,43 +4171,43 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="847"/>
+        <location filename="../src/EditProduct.cpp" line="849"/>
         <source>BMSapp - Add new product</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="849"/>
+        <location filename="../src/EditProduct.cpp" line="851"/>
         <source>BMSapp - Edit %1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="865"/>
-        <location filename="../src/EditProduct.cpp" line="869"/>
+        <location filename="../src/EditProduct.cpp" line="867"/>
+        <location filename="../src/EditProduct.cpp" line="871"/>
         <source>Edit Product</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="865"/>
+        <location filename="../src/EditProduct.cpp" line="867"/>
         <source>Name empty or too short.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="869"/>
+        <location filename="../src/EditProduct.cpp" line="871"/>
         <source>No beerstyle selected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="908"/>
+        <location filename="../src/EditProduct.cpp" line="910"/>
         <source>Delete product</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="932"/>
+        <location filename="../src/EditProduct.cpp" line="934"/>
         <source>Product changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="932"/>
+        <location filename="../src/EditProduct.cpp" line="934"/>
         <source>The product has been modified. Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4333,7 +4333,7 @@
         <location filename="../src/EditProductTab6.cpp" line="896"/>
         <location filename="../src/EditProductTab7.cpp" line="306"/>
         <location filename="../src/EditProductTab13.cpp" line="271"/>
-        <location filename="../src/EditProduct.cpp" line="908"/>
+        <location filename="../src/EditProduct.cpp" line="910"/>
         <source>Delete %1</source>
         <translation type="unfinished"></translation>
     </message>
--- a/translations/bmsapp_nl.ts	Sat Jan 21 14:27:10 2023 +0100
+++ b/translations/bmsapp_nl.ts	Sat Jan 21 16:18:37 2023 +0100
@@ -4542,27 +4542,27 @@
     <message>
         <location filename="../ui/EditProduct.ui" line="12221"/>
         <source>Previous</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorige</translation>
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="12238"/>
         <source>Next</source>
-        <translation type="unfinished"></translation>
+        <translation>Volgende</translation>
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="12311"/>
         <source>Filename:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestand:</translation>
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="12327"/>
         <source>Comment:</source>
-        <translation type="unfinished"></translation>
+        <translation>Bijschrift:</translation>
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="12372"/>
         <source>Type:</source>
-        <translation type="unfinished">Soort:</translation>
+        <translation>Soort:</translation>
     </message>
     <message>
         <location filename="../ui/EditProduct.ui" line="12416"/>
@@ -4591,7 +4591,7 @@
         <translation>Mout</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="849"/>
+        <location filename="../src/EditProduct.cpp" line="851"/>
         <source>BMSapp - Edit %1 - %2</source>
         <translation>BMSapp - Wijzig %1 - %2</translation>
     </message>
@@ -4659,7 +4659,7 @@
         <translation type="vanished">Koken %1 minuten</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="847"/>
+        <location filename="../src/EditProduct.cpp" line="849"/>
         <source>BMSapp - Add new product</source>
         <translation>BMSapp - Nieuw product</translation>
     </message>
@@ -4668,18 +4668,18 @@
         <translation type="vanished">BMSapp - Wijzig product %1</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="865"/>
-        <location filename="../src/EditProduct.cpp" line="869"/>
+        <location filename="../src/EditProduct.cpp" line="867"/>
+        <location filename="../src/EditProduct.cpp" line="871"/>
         <source>Edit Product</source>
         <translation>Wijzig Product</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="865"/>
+        <location filename="../src/EditProduct.cpp" line="867"/>
         <source>Name empty or too short.</source>
         <translation>De naam is leeg of te kort.</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="869"/>
+        <location filename="../src/EditProduct.cpp" line="871"/>
         <source>No beerstyle selected.</source>
         <translation>Geen bierstijl gekozen.</translation>
     </message>
@@ -4695,17 +4695,17 @@
 %3</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="908"/>
+        <location filename="../src/EditProduct.cpp" line="910"/>
         <source>Delete product</source>
         <translation>Verwijder product</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="932"/>
+        <location filename="../src/EditProduct.cpp" line="934"/>
         <source>Product changed</source>
         <translation>Product gewijzigd</translation>
     </message>
     <message>
-        <location filename="../src/EditProduct.cpp" line="932"/>
+        <location filename="../src/EditProduct.cpp" line="934"/>
         <source>The product has been modified. Save changes?</source>
         <translation>Het product is gewijzigd. Wijzigingen opslaan?</translation>
     </message>
@@ -4843,7 +4843,7 @@
         <location filename="../src/EditProductTab6.cpp" line="896"/>
         <location filename="../src/EditProductTab7.cpp" line="306"/>
         <location filename="../src/EditProductTab13.cpp" line="271"/>
-        <location filename="../src/EditProduct.cpp" line="908"/>
+        <location filename="../src/EditProduct.cpp" line="910"/>
         <source>Delete %1</source>
         <translation>Verwijder %1</translation>
     </message>
@@ -5893,7 +5893,7 @@
     <message>
         <location filename="../src/EditProductTab13.cpp" line="271"/>
         <source>Delete image</source>
-        <translation type="unfinished"></translation>
+        <translation>Wis plaatje</translation>
     </message>
 </context>
 <context>

Mercurial Repository: bmsapp

mercurial