Skip to content

Commit

Permalink
made ready for release of v1.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
frrahat committed Jun 10, 2016
1 parent defc06a commit 5156b62
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .preferences/audio.preferences
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
isAudioOn=1
AudioSI=0
cur.ayah=5:3
cur.ayah=1:1
1 change: 1 addition & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ eclipse.preferences.version=1
encoding//src/QuranTeacher/Dialogs/AboutDialog.java=UTF-8
encoding//src/QuranTeacher/PreferencesSetupPanels/TranslationSetupPanel.java=UTF-8
encoding//src/QuranTeacher/RenderAnimation/Animation.java=UTF-8
encoding//src/QuranTeacher/files/texts/WbWInfo.txt=UTF-8
Binary file modified bin/QuranTeacher/FilePaths.class
Binary file not shown.
Binary file modified bin/QuranTeacher/MainWindow/MainDisplayPart/AnimationPanel.class
Binary file not shown.
Binary file modified bin/QuranTeacher/Preferences/deltaPixelProperty.class
Binary file not shown.
14 changes: 8 additions & 6 deletions bin/QuranTeacher/QT_new_update_info.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
1.3.1
16-10-2015, 09:48pm
https://github.com/frrahat/Quran-Teacher-Or-Learn-Arabic/releases/download/1.3.1/QuranTeacherOrLearnArabic_v1.3.1.zip
1.3.2
10-06-2016, 07:45pm
https://github.com/frrahat/Quran-Teacher-Or-Learn-Arabic/releases/download/1.3.2/QuranTeacherOrLearnArabic_v1.3.2.zip
Highly Recommended to download this new version
Changes
============
Two significant changes have been made:
1) All surahs except surah At Tawba will start with Bismillah while the animation is in Continuous Ayah mode
2) Scrolling control has been added. Auto scrolling of the display can be disabled.
1)10 significant mistakes have been resolved.
2)Hit file entry format has been changed. (See the sample files if you want to grasp the format.)
3)Redundand data reduced, the app size is now smaller.
4)Some lagging problems have been resolved.

Thank You for using this application. May Allah accept our works and efforts.
Binary file modified bin/QuranTeacher/RenderAnimation/Animation.class
Binary file not shown.
Binary file modified bin/QuranTeacher/WordInformation/WordInfoLoader.class
Binary file not shown.
Binary file modified bin/QuranTeacher/WordInformation/WordInformation.class
Binary file not shown.
2 changes: 1 addition & 1 deletion src/QuranTeacher/FilePaths.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class FilePaths {


public static final String surahInfoFilePath="/QuranTeacher/files/texts/sura-information.txt";
public static final String wordByWordFilePath="/QuranTeacher/files/texts/WbWInfoShort.txt";
public static final String wordByWordFilePath="/QuranTeacher/files/texts/WbWInfo.txt";
public static final String audioLinksFile="/QuranTeacher/files/texts/AudioLinks";
public static final String tahomaFontPath = "/QuranTeacher/files/fonts/Tahoma.ttf";
public static final String me_quranFontPath = "/QuranTeacher/files/fonts/me_quran_volt_mark2.ttf";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ private void autoRun() {
addNextWordToSentence();
//System.out.println(new word added);
//TODO trigger the command string
String hitString=hitStrings.get(displayedHitWords);
/*String hitString=hitStrings.get(displayedHitWords);
if(hitString.length()>0){
System.out.println("hitString : "+hitString);
}
}*/

hitFileEditorDialog.setListItemSelectedIndex(displayedHitWords);
displayedHitWords++;
Expand Down
2 changes: 1 addition & 1 deletion src/QuranTeacher/Preferences/deltaPixelProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public class deltaPixelProperty {
*/
public static int initialDeltaPixel=13;
public static int minDeltaPixel=2;
public static int maxDeltaPixel=40;
public static int maxDeltaPixel=30;
public static int delta=2;
}
14 changes: 8 additions & 6 deletions src/QuranTeacher/QT_new_update_info.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
1.3.1
16-10-2015, 09:48pm
https://github.com/frrahat/Quran-Teacher-Or-Learn-Arabic/releases/download/1.3.1/QuranTeacherOrLearnArabic_v1.3.1.zip
1.3.2
10-06-2016, 07:45pm
https://github.com/frrahat/Quran-Teacher-Or-Learn-Arabic/releases/download/1.3.2/QuranTeacherOrLearnArabic_v1.3.2.zip
Highly Recommended to download this new version
Changes
============
Two significant changes have been made:
1) All surahs except surah At Tawba will start with Bismillah while the animation is in Continuous Ayah mode
2) Scrolling control has been added. Auto scrolling of the display can be disabled.
1)10 significant mistakes have been resolved.
2)Hit file entry format has been changed. (See the sample files if you want to grasp the format.)
3)Redundand data reduced, the app size is now smaller.
4)Some lagging problems have been resolved.

Thank You for using this application. May Allah accept our works and efforts.
48 changes: 23 additions & 25 deletions src/QuranTeacher/RenderAnimation/Animation.java
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,14 @@ protected void paintComponent(Graphics g)
super.paintComponent(g);
setBackground(bgColor);

g.setColor(fgColor);
if(!ayahDisplayFinished){
drawDarkerStrings(g);
}
//g.setFont(font);
if(animationRunning)
drawAnimatedHighlightedStrings(g);
else
drawFixedHighlightedStrings(g);

if(!ayahDisplayFinished){
g.setColor(fgColor.darker().darker());
drawDarkerStrings(g);
}
}

//############################################################################
Expand Down Expand Up @@ -258,25 +255,21 @@ private boolean isWaqf(String word) {
protected abstract void goToNextStep();

private void drawDarkerStrings(Graphics g){
g.setColor(fgColor.darker().darker());
updateWordStartPoint();
g.setFont(animFont);

for(int wordIndex=wordsDisplayedSoFar;wordIndex < coordinatedWords.size();wordIndex++){
CoordinatedWord word=coordinatedWords.get(wordIndex);
g.drawString(word.getWord(), word.getStartX(),startPoint.y+LineHeightFactor*lineHeight*word.getLineIndex()-scrollY);
}
drawCoordinatedWords(g, wordsDisplayedSoFar, coordinatedWords.size());
//drawMeaningOfWord(g);
}

private void drawAnimatedHighlightedStrings(Graphics g)
{
g.setColor(fgColor);
//updateWordStartPoint();
g.setFont(animFont);

for(int wordIndex=0;wordIndex < wordsDisplayedSoFar;wordIndex++){
CoordinatedWord word=coordinatedWords.get(wordIndex);
g.drawString(word.getWord(), word.getStartX(),startPoint.y+LineHeightFactor*lineHeight*word.getLineIndex()-scrollY);
}
drawCoordinatedWords(g, 0, wordsDisplayedSoFar);
//draw scrollbar in right position
scrollbarPosY=(int) ((getBounds().getHeight()*scrollY)/currentDisplayPoint.y);

Expand All @@ -291,20 +284,18 @@ private void drawAnimatedHighlightedStrings(Graphics g)
g.setColor(Color.RED);
if(wordsDisplayedSoFar>0)
{
//System.out.println("total rectangles :"+rectangles.size());
Rectangle rect;

//System.out.println("total rectangles :"+rectangles.size());
if(showPopUpInfoBox)
{
rect=rectangles.get(wordsDisplayedSoFar-1);
Rectangle rect=rectangles.get(wordsDisplayedSoFar-1);
g.drawRect(rect.x,rect.y-scrollY,rect.width,rect.height);
drawInfoBox(g, false);
}

if(mouseFocusedOn!=-1)
{
g.setColor(Color.GREEN);
rect=rectangles.get(mouseFocusedOn);
Rectangle rect=rectangles.get(mouseFocusedOn);
g.drawRect(rect.x,rect.y-scrollY,rect.width,rect.height);

drawInfoBox(g, true);
Expand Down Expand Up @@ -339,12 +330,10 @@ private void HidePartial(Graphics g) {

private void drawFixedHighlightedStrings(Graphics g)
{
g.setColor(fgColor);
g.setFont(animFont);
//drawAyah
for(int wordIndex=0;wordIndex < wordsDisplayedSoFar;wordIndex++){
CoordinatedWord word=coordinatedWords.get(wordIndex);
g.drawString(word.getWord(), word.getStartX(),startPoint.y+LineHeightFactor*lineHeight*word.getLineIndex()-scrollY);
}
drawCoordinatedWords(g, 0, wordsDisplayedSoFar);

//draw scrollbar

Expand All @@ -368,6 +357,15 @@ private void drawFixedHighlightedStrings(Graphics g)
drawInfoBox(g, true);
}
}

private void drawCoordinatedWords(Graphics g, int start, int end) {
int z=LineHeightFactor*lineHeight;
CoordinatedWord coordinatedWord;
for(int wordIndex=start;wordIndex < end;wordIndex++){
coordinatedWord=coordinatedWords.get(wordIndex);
g.drawString(coordinatedWord.getWord(), coordinatedWord.getStartX(),startPoint.y+z*coordinatedWord.getLineIndex()-scrollY);
}
}

private void drawInfoBox(Graphics g,boolean fromMouseFocus)
{
Expand Down Expand Up @@ -527,8 +525,8 @@ private void drawMeaningOfWord(Graphics g)
problemOccured(i);
}
}

for(int i=wordsDisplayedSoFar;i<coordinatedWords.size();i++)//not highlighted
int size=coordinatedWords.size();
for(int i=wordsDisplayedSoFar;i<size;i++)//not highlighted
{
rect=rectangles.get(i);

Expand Down
6 changes: 3 additions & 3 deletions src/QuranTeacher/WordInformation/WordInformation.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public WordInformation(int index, String wordId, String transLiteration,
String meaning, String[] partsOfSpeeches,
String[] segmentColors, String[] partsOfSpeechDetails) {

partsOfSpeeches=new String[maxPartsOfSpeech];
segmentColors=new String[maxPartsOfSpeech];
partsOfSpeechDetails=new String[maxPartsOfSpeech];
//partsOfSpeeches=new String[maxPartsOfSpeech];
//segmentColors=new String[maxPartsOfSpeech];
//partsOfSpeechDetails=new String[maxPartsOfSpeech];

this.index = index;
this.wordId = wordId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#------------
#This file has been progrmmatically generated from http://corpus.quran.com/wordbyword.jsp
#And should not be modified at any cost except if any mismatch is found with original website
#If any problem is found please email at [email protected]
#Include the statements above if you use the infos of this file in your app
#------------
#Fields:
#index
#wordId
#transLiteration
Expand Down

0 comments on commit 5156b62

Please sign in to comment.