diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec5f01986c7cbd92b06da92e6166960adaef71fb..1eb1540eafda247a6ccade6cd5d4f0dfc5ef995b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ server_test_py27: stage: build script: - cd minarca-server - - apt-get update && apt-get -qq install python-pysqlite2 libldap2-dev libsasl2-dev rdiff-backup node-less + - apt-get update && apt-get -qq install libldap2-dev libsasl2-dev rdiff-backup node-less - pip install pip setuptools tox nose coverage --upgrade - python setup.py build - export TOXENV=`tox --listenvs | grep "^py27" | tr '\n' ','` @@ -29,7 +29,7 @@ server_test_py3: stage: build script: - cd minarca-server - - apt-get update && apt-get -qq install python-pysqlite2 libldap2-dev libsasl2-dev rdiff-backup node-less + - apt-get update && apt-get -qq install libldap2-dev libsasl2-dev rdiff-backup node-less - pip install pip setuptools tox nose coverage --upgrade - python setup.py build - export TOXENV=`tox --listenvs | grep "^py3" | tr '\n' ','` diff --git a/minarca-client/minarca-core/src/main/java/com/patrikdufresne/minarca/core/internal/Compat.java b/minarca-client/minarca-core/src/main/java/com/patrikdufresne/minarca/core/internal/Compat.java index ba7f3b4bd4ce2e2df5f91d8c5353e19a5b19a310..a498b69d97a5ce6ac6e4d61ac8fbd50a872e2c69 100644 --- a/minarca-client/minarca-core/src/main/java/com/patrikdufresne/minarca/core/internal/Compat.java +++ b/minarca-client/minarca-core/src/main/java/com/patrikdufresne/minarca/core/internal/Compat.java @@ -132,7 +132,7 @@ public class Compat { /** * Define the location of minarca log files. */ - public static String LOG_FOLDER = System.getProperty("log.folder", Compat.TEMP); + public static String LOG_FOLDER; static { // Use a static block to declare constant value in the right order. @@ -146,6 +146,7 @@ public class Compat { PID_FILE_GUI = new File(DATA_HOME, "gui.pid"); TEMP = getTemp(); HOME = getHome(IS_ADMIN); + LOG_FOLDER = System.getProperty("log.folder", Compat.TEMP); STATUS_FILE = new File(Compat.DATA_HOME, "status.properties"); diff --git a/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/CListItem.java b/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/CListItem.java index 2cf72a5e9e21b4ffe9f54be9abff8dc467113b60..cae9e9c77f86c5599d5c8b7a6559728eb4b58072 100644 --- a/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/CListItem.java +++ b/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/CListItem.java @@ -486,6 +486,9 @@ public class CListItem extends Composite { if (rightValueText != null) { rightValueText.setForeground(color); } + if (rightValueHelpText != null) { + rightValueHelpText.setForeground(color); + } } /** diff --git a/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/SettingsDialog.java b/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/SettingsDialog.java index 7cef75a79dff2036da1a717298a7e89bd2581fb0..9efedf2cbd4fb63661de8084ee6a75c781f10561 100644 --- a/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/SettingsDialog.java +++ b/minarca-client/minarca-ui/src/main/java/com/patrikdufresne/minarca/ui/SettingsDialog.java @@ -185,6 +185,7 @@ public class SettingsDialog extends Dialog { public void run() { // Test the connectivity with minarca server using test-server. String text; + String fHelpText = _("to {0} as {1}", API.instance().config().getRemotehost(), API.instance().config().getUsername());; boolean linked; try { API.instance().testServer(); @@ -207,6 +208,7 @@ public class SettingsDialog extends Dialog { // Update the value of status item statusItem.setValue(fText); + statusItem.setValueHelpText(fHelpText); // Update the colour of the status. ft.setSkinClass(statusItem, !fLinked ? AppFormToolkit.CLASS_ERROR : AppFormToolkit.CLASS_SUCESS);