(*)fix preview stone picture

Author: missdeer

src/imagehandler.cpp

@@ -281,23 +281,21 @@ void ImageHandler::paint_stone_new (QImage &wi, int d, const QColor &col, double
 
 void ImageHandler::paint_white_stone_picture(QImage &img, int size)
 {
-	QString path = setting->readEntry("STONES_WPICTURE");
-	QImage image(path);
+	QImage image(m_whiteStonePicturePath);
 	QPainter painter;
 	painter.begin (&img);
 	img.fill(Qt::transparent);
-	painter.drawImage(QRect(0,0,size*9/10,size*9/10), image, image.rect());
+	painter.drawImage(QRect(0,0,size*95/100,size*95/100), image, image.rect());
 	painter.end ();
 }
 
 void ImageHandler::paint_black_stone_picture(QImage &img, int size)
 {
-	QString path = setting->readEntry("STONES_BPICTURE");
-	QImage image(path);
+	QImage image(m_blackStonePicturePath);
 	QPainter painter;
 	painter.begin (&img);
 	img.fill(Qt::transparent);
-	painter.drawImage(QRect(0,0,size*9/10,size*9/10), image, image.rect());
+	painter.drawImage(QRect(0,0,size*95/100,size*95/100), image, image.rect());
 	painter.end ();
 }
 

src/imagehandler.h

@@ -24,6 +24,7 @@ class ImageHandler
 	double m_ambient { 0.2 };
 	bool m_clamshell;
 	int m_look;
+	QString m_whiteStonePicturePath, m_blackStonePicturePath;
 
 	/* We want the appearance to stay the same across resizes, so we generate
 	   some random numbers in the constructor.  */
@@ -39,7 +40,8 @@ class ImageHandler
 
 	void set_stone_params (double w_hard, double b_hard, double w_spec, double b_spec,
 			       double w_radius, double b_radius, int w_flat, int b_flat,
-			       double ambient, int look, bool clamshell)
+			       double ambient, int look, bool clamshell,
+			       const QString& whiteStonePicturePath, const QString& blackStonePicturePath)
 	{
 		m_w_hard = w_hard;
 		m_b_hard = b_hard;
@@ -52,6 +54,8 @@ class ImageHandler
 		m_ambient = ambient;
 		m_clamshell = clamshell;
 		m_look = look;
+		m_whiteStonePicturePath = whiteStonePicturePath;
+		m_blackStonePicturePath = blackStonePicturePath;
 	}
 
 	void paint_one_stone (QImage &, bool white, int size, int idx = 0);

src/preferences.cpp

@@ -79,9 +79,9 @@ PreferencesDialog::PreferencesDialog(QWidget* parent)
 
 	connect (radioButtonStones_2D, &QRadioButton::toggled, this, &PreferencesDialog::select_stone_look);
 	connect (radioButtonStones_3D, &QRadioButton::toggled, this, &PreferencesDialog::select_stone_look);
-    connect (radioButtonStone_picture, &QRadioButton::toggled, this, &PreferencesDialog::select_stone_look);
-    connect (blackStonePicturePathEdit, &QLineEdit::textChanged, [=] () { update_b_stones (); });
-    connect (whiteStonePicturePathEdit, &QLineEdit::textChanged, [=] () { update_w_stones (); });
+	connect (radioButtonStone_picture, &QRadioButton::toggled, this, &PreferencesDialog::select_stone_look);
+	connect (blackStonePicturePathEdit, &QLineEdit::textChanged, [=] () { update_b_stones (); });
+	connect (whiteStonePicturePathEdit, &QLineEdit::textChanged, [=] () { update_w_stones (); });
 
 	connect (whiteColorButton, &QToolButton::clicked, this, &PreferencesDialog::select_white_color);
 	connect (blackColorButton, &QToolButton::clicked, this, &PreferencesDialog::select_black_color);
@@ -297,6 +297,8 @@ void PreferencesDialog::select_black_color (bool)
 
 void PreferencesDialog::update_stone_params ()
 {
+	QString whiteStonePicturePath = whiteStonePicturePathEdit->text();
+	QString blackStonePicturePath = blackStonePicturePathEdit->text();
 	double br = 2.05 + (100 - blackRoundSlider->value ()) / 30.0;
 	double wr = 2.05 + (100 - whiteRoundSlider->value ()) / 30.0;
 	double bs = blackSpecSlider->value () / 100.0;
@@ -316,7 +318,7 @@ void PreferencesDialog::update_stone_params ()
 		look = 4;
 	blackGroupBox->setEnabled (look == 3);
 	whiteGroupBox->setEnabled (look == 3);
-	m_ih->set_stone_params (wh, bh, ws, bs, wr, br, wf, bf, ambient, look, clamshell);
+	m_ih->set_stone_params (wh, bh, ws, bs, wr, br, wf, bf, ambient, look, clamshell, whiteStonePicturePath, blackStonePicturePath);
 }
 
 void PreferencesDialog::update_w_stones ()