New options dialog

Quelea/build.gradle

@@ -27,18 +27,18 @@ buildScan {
 }
 
 ext {
-    versionsuffix = System.properties["versionsuffix"]!=null ? System.properties["versionsuffix"] : project.queleaversion
-    
-    CPInstallerName="quelea-" + versionsuffix + "-crossplatform-install.jar"
-    WindowsInstallerName="quelea-" + versionsuffix + "-x86-windows-install.exe"
-    WindowsInstaller64Name="quelea-" + versionsuffix + "-x64-windows-install.exe"
-    MacInstallerName="quelea-" + versionsuffix + "-mac.zip"
-    DebInstallerName ="quelea-" + versionsuffix + "-deb-install.deb"
-    
-    CPInstaller ="dist/standalone/" + CPInstallerName
-    DebInstaller ="dist/standalone/" + DebInstallerName
-    WindowsInstaller="dist/standalone/" + ext.WindowsInstallerName
-    WindowsInstaller64="dist/standalone/" + ext.WindowsInstaller64Name
+    versionsuffix = System.properties["versionsuffix"] != null ? System.properties["versionsuffix"] : project.queleaversion
+
+    CPInstallerName = "quelea-" + versionsuffix + "-crossplatform-install.jar"
+    WindowsInstallerName = "quelea-" + versionsuffix + "-x86-windows-install.exe"
+    WindowsInstaller64Name = "quelea-" + versionsuffix + "-x64-windows-install.exe"
+    MacInstallerName = "quelea-" + versionsuffix + "-mac.zip"
+    DebInstallerName = "quelea-" + versionsuffix + "-deb-install.deb"
+
+    CPInstaller = "dist/standalone/" + CPInstallerName
+    DebInstaller = "dist/standalone/" + DebInstallerName
+    WindowsInstaller = "dist/standalone/" + ext.WindowsInstallerName
+    WindowsInstaller64 = "dist/standalone/" + ext.WindowsInstaller64Name
 }
 
 tasks.withType(JavaCompile) {
@@ -64,7 +64,7 @@ task createQueleaExe64(type: edu.sc.seis.launch4j.tasks.Launch4jLibraryTask) { /
     icon = "../../icons/logo.ico"
     copyright = "GPLv3"
     bundledJrePath = "winjre64"
-    jvmOptions = ["-Dfile.encoding=UTF-8","-Dprism.dirtyopts=false","-Dglass.accessible.force=false"]
+    jvmOptions = ["-Dfile.encoding=UTF-8", "-Dprism.dirtyopts=false", "-Dglass.accessible.force=false"]
     bundledJre64Bit = true
     outfile = "Quelea64.exe"
 }
@@ -83,42 +83,48 @@ task createQueleaExe64(type: edu.sc.seis.launch4j.tasks.Launch4jLibraryTask) { /
 
 task copyToDist {
     doLast {
-        copy {from configurations.runtime into project.distdir + "/lib"} //libraries
-        copy {from "themes" into project.distdir + "/themes"}
-        copy {from "icons" into project.distdir + "/icons"}
-        copy {from "bibles" into project.distdir + "/bibles"}
-        copy {from "server" into project.distdir + "/server"}
-        copy {from "vid" into project.distdir + "/vid"}
-        copy {from "vbs" into project.distdir + "/vbs"}
-        copy {from "licenses" into project.distdir + "/licenses"}
-        copy {from "languages" into project.distdir + "/languages"}
-        copy {from "dictionaries" into project.distdir + "/dictionaries"}
-        copy {from "img" into project.distdir + "/img"}
-        copy {from "timer" into project.distdir + "/timer"}
-        copy {from "src" into project.distdir + "/src"}
+        copy { from configurations.runtime into project.distdir + "/lib" } //libraries
+        copy { from "themes" into project.distdir + "/themes" }
+        copy { from "icons" into project.distdir + "/icons" }
+        copy { from "bibles" into project.distdir + "/bibles" }
+        copy { from "server" into project.distdir + "/server" }
+        copy { from "vid" into project.distdir + "/vid" }
+        copy { from "vbs" into project.distdir + "/vbs" }
+        copy { from "licenses" into project.distdir + "/licenses" }
+        copy { from "languages" into project.distdir + "/languages" }
+        copy { from "dictionaries" into project.distdir + "/dictionaries" }
+        copy { from "img" into project.distdir + "/img" }
+        copy { from "timer" into project.distdir + "/timer" }
+        copy { from "src" into project.distdir + "/src" }
 //        copy {from zipTree("bundlejre/winjre.zip") into project.distdir}
-        copy {from zipTree("bundlejre/winjre64.zip") into project.distdir}
-        copy {from file("build/libs/Quelea.jar") into file(project.distdir)}
-        copy {from file("README.TXT") into file(project.distdir)}
-        copy {from file("quelea.properties") into file(project.distdir)}
-        copy {from file("scheduleformat.xsl") into file(project.distdir)}
-        copy {from file("songformat.xsl") into file(project.distdir)}
-        copy {from file("fopcfg.xml") into file(project.distdir)}
-        copy {from file("Quelea.bat") into file(project.distdir)}
-        copy {from file("quelea.iss") into file(project.distdir)}
-        copy {from file("quelea64.iss") into file(project.distdir)}
-        copy {from file("build-install.bat") into file(project.distdir)}
-        copy {from file("build-install.sh") into file(project.distdir)}
-        copy {from file("licenses/gplv3.txt") into file(project.distdir) rename { String filename -> return "LICENSE.txt"}}
-        copy {from file("launch.sh") into file(project.distdir)}
-        copy {from file("licenses/copyright") into file(project.distdir + "/queleadoc")}
+        copy { from zipTree("bundlejre/winjre64.zip") into project.distdir }
+        copy { from file("build/libs/Quelea.jar") into file(project.distdir) }
+        copy { from file("README.TXT") into file(project.distdir) }
+        copy { from file("quelea.properties") into file(project.distdir) }
+        copy { from file("scheduleformat.xsl") into file(project.distdir) }
+        copy { from file("songformat.xsl") into file(project.distdir) }
+        copy { from file("fopcfg.xml") into file(project.distdir) }
+        copy { from file("Quelea.bat") into file(project.distdir) }
+        copy { from file("quelea.iss") into file(project.distdir) }
+        copy { from file("quelea64.iss") into file(project.distdir) }
+        copy { from file("build-install.bat") into file(project.distdir) }
+        copy { from file("build-install.sh") into file(project.distdir) }
+        copy {
+            from file("licenses/gplv3.txt") into file(project.distdir) rename { String filename -> return "LICENSE.txt" }
+        }
+        copy { from file("launch.sh") into file(project.distdir) }
+        copy { from file("licenses/copyright") into file(project.distdir + "/queleadoc") }
     }
 }
 
 task grabNative {
     doLast {
         def f = project.file(project.distdir + '/lib/libAVPlayerJava.jnilib')
-        new URL('https://github.com/quelea-projection/libAVPlayerJava/releases/download/v1.0/libAVPlayerJava.jnilib').withInputStream{ i -> f.withOutputStream{ it << i }}
+        new URL('https://github.com/quelea-projection/libAVPlayerJava/releases/download/v1.0/libAVPlayerJava.jnilib').withInputStream { i ->
+            f.withOutputStream {
+                it << i
+            }
+        }
     }
 }
 copyToDist.finalizedBy(grabNative)
@@ -129,7 +135,7 @@ izpack {
     baseDir = file("dist")
 }
 
-task innosetup (type:Exec) {
+task innosetup(type: Exec) {
     doFirst {
         workingDir = project.file('.')
         if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
@@ -138,17 +144,21 @@ task innosetup (type:Exec) {
             commandLine = ['sh', './build-install.sh', project.queleaversion]
         }
     }
-    
+
     doLast {
-        copy {from file("Output/setup.exe") into file(project.distdir + "/standalone") rename { String filename -> return WindowsInstallerName}}
-        copy {from file("Output/setup64.exe") into file(project.distdir + "/standalone") rename { String filename -> return WindowsInstaller64Name}}
-        delete (file("Output"))
+        copy {
+            from file("Output/setup.exe") into file(project.distdir + "/standalone") rename { String filename -> return WindowsInstallerName }
+        }
+        copy {
+            from file("Output/setup64.exe") into file(project.distdir + "/standalone") rename { String filename -> return WindowsInstaller64Name }
+        }
+        delete(file("Output"))
     }
 }
 
-task labelcheck(type:JavaExec) {
-   main = 'org.quelea.services.languages.LabelChecker'
-   classpath = sourceSets.main.runtimeClasspath
+task labelcheck(type: JavaExec) {
+    main = 'org.quelea.services.languages.LabelChecker'
+    classpath = sourceSets.main.runtimeClasspath
 }
 
 task runPackr(type: JavaExec) {
@@ -160,11 +170,11 @@ task runPackr(type: JavaExec) {
 task zipMacPackr(type: Zip) {
     archiveName = MacInstallerName
     destinationDir = file("dist/standalone")
-    
+
     from "out-mac"
-    
+
     doLast {
-        delete (file("out-mac"))
+        delete(file("out-mac"))
     }
 }
 
@@ -178,7 +188,7 @@ build.finalizedBy(dist)
 
 dependencies {
     izpack 'org.codehaus.izpack:izpack-standalone-compiler:4.3.5'
-    
+
     compile 'com.googlecode.paradoxdriver:paradoxdriver:1.4.0'
     compile 'com.github.berry120.jopenlyrics:jopenlyrics:2.0'
     compile group: 'org.hsqldb', name: 'hsqldb', version: '2.4.1'
@@ -222,20 +232,28 @@ dependencies {
 
     compile group: 'org.jflac', name: 'jflac-codec', version: '1.5.2'
     compile group: 'org.jcraft', name: 'jorbis', version: '0.0.17'
-    
+
     compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
     compile group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0.1'
     compile group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
     compile group: 'javax.activation', name: 'activation', version: '1.1.1'
-
+
+    compile group: 'com.dlsc.preferencesfx', name: 'preferencesfx-core', version: '8.3.2'
+
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
+repositories {
+    maven {
+        url "http://maven.bestsolution.at/efxclipse-releases"
+    }
+}
+
 jar {
     manifest {
-        attributes (
-            'Main-Class': 'org.quelea.windows.main.Main',
-            "Class-Path": configurations.compile.collect { "lib/" + it.getName() }.join(' ')
+        attributes(
+                'Main-Class': 'org.quelea.windows.main.Main',
+                "Class-Path": configurations.compile.collect { "lib/" + it.getName() }.join(' ')
         )
     }
 }

Quelea/languages/gb.lang

@@ -685,6 +685,10 @@ video.loop.tooltip=Toggle looping on / off
 allow.item.theme.override.global=Allow custom item themes to override global theme
 song.default.theme.label=Song default
 bible.default.theme.label=Bible default
+small.song.position.label=Song information position
+small.bible.position.label=Bible information position
+small.bible.size.label=Bible information size
+small.song.size.label=Song information size
 interface.theme.label=Application theme
 default.theme.label=Default
 dark.theme.label=Dark
@@ -694,3 +698,11 @@ db.song.preview.label=Database song preview
 db.song.preview.label.control=None
 db.song.preview.label.databasepreview=In database pane
 db.song.preview.label.previewpane=In preview pane
+mobile.remote.heading=Mobile Remote
+interface.options.options=Interface Options
+general.interface.options=General Interface Options
+small.song.text.options=Small Song Text Options
+small.bible.text.options=Small Bible Text Options
+general.user.options=General User Options
+theme.options=Theme Options
+schedule.options=Schedule Options

Quelea/src/main/java/org/quelea/data/bible/BibleManager.java

@@ -112,6 +112,14 @@ public Bible[] getBibles() {
         return bibles.toArray(new Bible[bibles.size()]);
     }
 
+    public Bible getBibleFromName(String name) {
+        for (Bible b : bibles) {
+            if (b.getName().equals(name))
+                return b;
+        }
+        return null;
+    }
+
     /**
      * Get the underlying search index used by this bible manager.
      * <p/>

Quelea/src/main/java/org/quelea/server/AutoDetectServer.java

@@ -83,8 +83,8 @@ private class RootHandler implements HttpHandler {
         @Override
         public void handle(HttpExchange t) throws IOException {
             String response;
-            response = "" + QueleaApp.get().getMainWindow().getOptionsDialog().getServerSettingsPanel().getMLURL() + "\n";
-            response = response + QueleaApp.get().getMainWindow().getOptionsDialog().getServerSettingsPanel().getRCURL();
+            response = "" + QueleaApp.get().getMainWindow().getPreferencesDialog().getOptionsServerSettingsPanel().getLyricsPreference().getMLURL() + "\n";
+            response = response + QueleaApp.get().getMainWindow().getPreferencesDialog().getOptionsServerSettingsPanel().getRemotePreference().getRCURL();
             t.sendResponseHeaders(200, response.length());
             try (OutputStream os = t.getResponseBody()) {
                 os.write(response.getBytes());

Quelea/src/main/java/org/quelea/services/languages/LabelGrabber.java

@@ -1,6 +1,6 @@
 /*
  * This file is part of Quelea, free projection software for churches.
- * 
+ *
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by * the Free
@@ -119,17 +119,30 @@ public String getLabel(String key) {
         }
         return ret;
     }
-
+
+    public String getEngKey(String label) {
+        if (english)
+            return label;
+        int pos = 0;
+        for (String s : labels.stringPropertyNames()) {
+            if (getLabel(s).toLowerCase().equals(label.toLowerCase())) {
+                return engLabels.get(labels.keySet().toArray()[pos]).toString();
+            }
+            pos++;
+        }
+        return null;
+    }
+
     @Override
     public Enumeration<String> getKeys() {
         return Collections.enumeration(keySet());
     }
-    
+
     @Override
     public Object handleGetObject(String key) {
         return getLabel(key);
     }
-    
+
     // Overrides handleKeySet() so that the getKeys() implementation
     // can rely on the keySet() value.
     @Override