mirror of
https://github.com/anas-elgarhy/Ayah-intellij.git
synced 2024-08-15 00:43:43 +00:00
Merge pull request #77 from 0x61nas/revert-61-update-the-details-dialog
Revert "Add the tafseer/translation text box to the ayah details dialog and make the user able to change the player edition on the fly"
This commit is contained in:
GitHub
commit
4d67f7b2dc
2 changed files with 23 additions and 166 deletions
|
|
@ -3,7 +3,7 @@
|
|||
<grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="10" left="10" bottom="10" right="10"/>
|
||||
<constraints>
|
||||
<xy x="48" y="54" width="836" height="472"/>
|
||||
<xy x="48" y="54" width="577" height="355"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<maximumSize width="500" height="300"/>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<grid id="9538f" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="9538f" layout-manager="GridLayoutManager" row-count="2" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<grid row="0" column="0" row-span="1" col-span="6" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
|
|
@ -60,77 +60,25 @@
|
|||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
<grid id="e3ffd" layout-manager="GridBagLayout">
|
||||
<component id="69418" class="javax.swing.JButton" binding="previousButton">
|
||||
<constraints>
|
||||
<grid row="1" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
|
||||
<grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<component id="c14dc" class="javax.swing.JLabel">
|
||||
<constraints>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
<gridbag weightx="0.0" weighty="1.0"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text value="Tafseer/Translation"/>
|
||||
<verifyInputWhenFocusTarget value="false"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="1bfe0" class="javax.swing.JComboBox" binding="tafseerAndTranslationComboBox">
|
||||
<constraints>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
|
||||
<gridbag weightx="1.0" weighty="1.0"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
</component>
|
||||
<component id="82c3f" class="javax.swing.JLabel">
|
||||
<constraints>
|
||||
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
|
||||
<gridbag weightx="0.0" weighty="1.0"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text value="Edition"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="3ac9d" class="javax.swing.JComboBox" binding="editionComboBox">
|
||||
<constraints>
|
||||
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
|
||||
<gridbag weightx="1.0" weighty="1.0"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
<grid id="d5ada" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<properties>
|
||||
<text value="Previous"/>
|
||||
<toolTipText value="Previous Aah"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="b465c" class="javax.swing.JButton" binding="nextButton" default-binding="true">
|
||||
<constraints>
|
||||
<grid row="2" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<component id="b465c" class="javax.swing.JButton" binding="nextButton" default-binding="true">
|
||||
<constraints>
|
||||
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<hideActionText value="true"/>
|
||||
<text value="Next"/>
|
||||
<toolTipText value="Nexit ayah"/>
|
||||
</properties>
|
||||
</component>
|
||||
<component id="69418" class="javax.swing.JButton" binding="previousButton">
|
||||
<constraints>
|
||||
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties>
|
||||
<text value="Previous"/>
|
||||
<toolTipText value="Previous Aah"/>
|
||||
</properties>
|
||||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
<properties>
|
||||
<hideActionText value="true"/>
|
||||
<text value="Next"/>
|
||||
<toolTipText value="Nexit ayah"/>
|
||||
</properties>
|
||||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
<component id="893ab" class="javax.swing.JCheckBox" binding="autoPlayCheckBox" default-binding="true">
|
||||
|
|
@ -159,7 +107,7 @@
|
|||
</component>
|
||||
</children>
|
||||
</grid>
|
||||
<grid id="e3588" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<grid id="e3588" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
|
||||
<margin top="0" left="0" bottom="0" right="0"/>
|
||||
<constraints>
|
||||
<grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
|
|
@ -189,25 +137,6 @@
|
|||
</component>
|
||||
</children>
|
||||
</scrollpane>
|
||||
<scrollpane id="6058b">
|
||||
<constraints>
|
||||
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
|
||||
</constraints>
|
||||
<properties/>
|
||||
<border type="none"/>
|
||||
<children>
|
||||
<component id="db36" class="javax.swing.JTextArea" binding="tafseerTextArea">
|
||||
<constraints/>
|
||||
<properties>
|
||||
<editable value="false"/>
|
||||
<focusable value="false"/>
|
||||
<lineWrap value="true"/>
|
||||
<preferredSize width="549" height="18"/>
|
||||
<wrapStyleWord value="true"/>
|
||||
</properties>
|
||||
</component>
|
||||
</children>
|
||||
</scrollpane>
|
||||
</children>
|
||||
</grid>
|
||||
</children>
|
||||
|
|
|
|||
|
|
@ -2,19 +2,15 @@ package com.anas.intellij.plugins.ayah.dialogs;
|
|||
|
||||
import com.anas.alqurancloudapi.Ayah;
|
||||
import com.anas.alqurancloudapi.consts.Constants;
|
||||
import com.anas.alqurancloudapi.edition.Edition;
|
||||
import com.anas.alqurancloudapi.edition.EditionFormat;
|
||||
import com.anas.intellij.plugins.ayah.audio.AudioPlayer;
|
||||
import com.anas.intellij.plugins.ayah.audio.PlayerListener;
|
||||
import com.anas.intellij.plugins.ayah.settings.userinterface.ReadableEdition;
|
||||
import javazoom.jl.player.advanced.PlaybackEvent;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.event.KeyEvent;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @author <a href="https://github.com/anas-elgarhy">Anas Elgarhy</a>
|
||||
|
|
@ -32,9 +28,6 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener {
|
|||
private JButton previousButton;
|
||||
private JButton nextButton;
|
||||
private JCheckBox autoPlayCheckBox;
|
||||
private JTextArea tafseerTextArea;
|
||||
private JComboBox<ReadableEdition> tafseerAndTranslationComboBox;
|
||||
private JComboBox<ReadableEdition> editionComboBox;
|
||||
private boolean isPlaying;
|
||||
private AudioPlayer audioPlayer;
|
||||
private Ayah ayah;
|
||||
|
|
@ -44,55 +37,21 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener {
|
|||
|
||||
setContentPane(contentPane);
|
||||
setModal(true);
|
||||
setSize(520, 320);
|
||||
setSize(500, 300);
|
||||
setResizable(false);
|
||||
setLocationRelativeTo(null);
|
||||
getRootPane().setDefaultButton(playButton);
|
||||
|
||||
try {
|
||||
setupTheUI();
|
||||
} catch (final IOException e) {
|
||||
e.printStackTrace();
|
||||
JOptionPane.showMessageDialog(this, "Error while loading the ayah details",
|
||||
"Error", JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
updateAhaDetails();
|
||||
|
||||
addListeners();
|
||||
}
|
||||
|
||||
private void setupTheUI() throws IOException {
|
||||
previousButton.setEnabled(ayah.getNumber() != 1 && ayah.getSurah().getNumber() != 1);
|
||||
nextButton.setEnabled(ayah.getNumber() != Constants.AYAHS_COUNT && ayah.getSurah().getNumber() != Constants.SURAS_COUNT);
|
||||
|
||||
|
||||
final var tafserAndTranslationComboBoxModel = new DefaultComboBoxModel<ReadableEdition>();
|
||||
final var editionComboBoxModel = new DefaultComboBoxModel<ReadableEdition>();
|
||||
|
||||
Arrays.stream(Edition.getEditions()).forEach(edition -> {
|
||||
if (edition.getFormat() == EditionFormat.AUDIO) {
|
||||
editionComboBoxModel.addElement(new ReadableEdition(edition));
|
||||
} else {
|
||||
tafserAndTranslationComboBoxModel.addElement(new ReadableEdition(edition));
|
||||
}
|
||||
});
|
||||
|
||||
tafseerAndTranslationComboBox.setModel(tafserAndTranslationComboBoxModel);
|
||||
editionComboBox.setModel(editionComboBoxModel);
|
||||
|
||||
// Set the default selected item for the editionComboBox
|
||||
editionComboBoxModel.setSelectedItem(new ReadableEdition(ayah.getEdition()));
|
||||
// Set the actual information about the ayah in the UI
|
||||
updateAyahDetails();
|
||||
}
|
||||
|
||||
private void updateAyahDetails() {
|
||||
// Update the ayah details
|
||||
private void updateAhaDetails() {
|
||||
ayahTextArea.setText(ayah.getText());
|
||||
surahNameLabel.setText(ayah.getSurah().getName());
|
||||
numberOfAyahInSuarhLabel.setText("آية رقم: " + ayah.getNumberInSurah());
|
||||
ayahRevelationType.setText(ayah.getSurah().getRevelationType().getArabicName());
|
||||
// Update the tafseer or translation
|
||||
updateTheTauseerTextArea();
|
||||
}
|
||||
|
||||
private void addListeners() {
|
||||
|
|
@ -133,24 +92,6 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener {
|
|||
}
|
||||
});
|
||||
|
||||
tafseerAndTranslationComboBox.addActionListener(e -> {
|
||||
updateTheTauseerTextArea();
|
||||
});
|
||||
|
||||
editionComboBox.addActionListener(e -> {
|
||||
final var selectedEdition = ((ReadableEdition) Objects.requireNonNull(
|
||||
editionComboBox.getSelectedItem())).getEdition();
|
||||
try {
|
||||
ayah = Ayah.getAyah(ayah.getNumber(), selectedEdition);
|
||||
updateAyahDetails();
|
||||
} catch (final IOException ioException) {
|
||||
ioException.printStackTrace();
|
||||
JOptionPane.showMessageDialog(this,
|
||||
"Error while loading the ayah - check your internet connection",
|
||||
"Error", JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
});
|
||||
|
||||
buttonCancel.addActionListener(l -> close());
|
||||
|
||||
// call onCancel() when cross is clicked
|
||||
|
|
@ -167,19 +108,6 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener {
|
|||
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
|
||||
}
|
||||
|
||||
private void updateTheTauseerTextArea() {
|
||||
final var selectedEdition = ((ReadableEdition) Objects.requireNonNull(
|
||||
tafseerAndTranslationComboBox.getSelectedItem())).getEdition();
|
||||
try {
|
||||
tafseerTextArea.setText(Ayah.getAyah(ayah.getNumber(), selectedEdition).getText());
|
||||
} catch (final IOException ioException) {
|
||||
ioException.printStackTrace();
|
||||
JOptionPane.showMessageDialog(this,
|
||||
"Error while loading the tafseer - check your internet connection",
|
||||
"Error", JOptionPane.ERROR_MESSAGE);
|
||||
}
|
||||
}
|
||||
|
||||
private void close() {
|
||||
if (audioPlayer != null) {
|
||||
audioPlayer.stop();
|
||||
|
|
@ -204,7 +132,7 @@ public class AyahDetailsDialog extends JDialog implements PlayerListener {
|
|||
try {
|
||||
ayah = Ayah.getAyah(ayhNumber,
|
||||
ayah.getEdition().getIdentifier());
|
||||
updateAyahDetails();
|
||||
updateAhaDetails();
|
||||
return true;
|
||||
} catch (final IOException ex) {
|
||||
JOptionPane.showMessageDialog(this,
|
||||
|
|
|
|||
Loading…
Reference in a new issue