Merging content

Jakjm · Mar 29, 2019 · fedbf8c · fedbf8c
1 parent 3a5c460
commit fedbf8c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/Talkbox/configurer/ButtonConfiguration.java b/src/main/java/Talkbox/configurer/ButtonConfiguration.java
@@ -40,11 +40,11 @@ public ButtonConfiguration(String buttonText, File buttonDir) {
 
 	/**
 	 * Add image file to the button configuration.
-	 * 
 	 * @param image The image file (JPEG or PNG).
 	 */
 	public void addImageFile(File image) {
 		if (image != null) {
+
 			this.imageFile = image;
 			FileIO.copyFile(image,
 					new File(this.buttonDir + FileIO.SEP + "sound" + FileIO.SEP + "image." + FileIO.getExt(image)));
@@ -144,6 +144,7 @@ public String toString() {
 		return format;
 	}
 
+
 	public String audioFilePath() {
 		return this.buttonDir.getPath() + FileIO.SEP + "sound" + FileIO.SEP + "sound.wav";
 	}

diff --git a/src/main/java/Talkbox/configurer/SetUpPanel.java b/src/main/java/Talkbox/configurer/SetUpPanel.java
@@ -631,8 +631,7 @@ else if (event.getSource() == playSound) {
 					button.setText(nameField.getText());
 					button.addColor(currentColor);
 					button.addSoundFile(currentAudioFile);
-					// TODO: set local variable for selected image --> button.addImageFile(selectedImage)
-					//button.addImageFile(currentImageFile);
+					button.addImageFile(currentImageFile);
 					currentButton.setConfiguration(currentButton.getConfiguration());
 					hideSetupFrame();
 				}
@@ -847,6 +846,7 @@ else if(event.getSource() == square) {
 				}
 				else if(event.getSource() == confirmImage) {
 
+
 				}
 			}
 		}