This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 0f6b69663155a0cffa7590b025fc552e134fc5c0 Author: Maxim Solodovnik <[email protected]> AuthorDate: Sat Mar 28 10:10:55 2020 +0700 [OPENMEETINGS-2167] config is added --- .../java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java | 3 +++ .../java/org/apache/openmeetings/installation/ImportInitvalues.java | 3 +++ .../main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java | 1 + 3 files changed, 7 insertions(+) diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java index 70f11e1..cdf355a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java @@ -38,6 +38,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FNAME_MI import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_GOOGLE_ANALYTICS_CODE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_CSP; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_ARRANGE; +import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_ARRANGE_RESIZE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_MUTE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_MUTE_OTHERS; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_QUICKPOLL; @@ -308,6 +309,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { case CONFIG_KEYCODE_MUTE_OTHERS: case CONFIG_KEYCODE_MUTE: case CONFIG_KEYCODE_QUICKPOLL: + case CONFIG_KEYCODE_ARRANGE_RESIZE: case CONFIG_AUTO_OPEN_SHARING: reloadRoomSettings(); break; @@ -584,6 +586,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { setRoomSettings(new JSONObject() .put("keycode", new JSONObject() .put("arrange", getHotkey(getString(CONFIG_KEYCODE_ARRANGE, "Shift+F8"))) + .put("arrangeresize", getHotkey(getString(CONFIG_KEYCODE_ARRANGE_RESIZE, "Ctrl+Shift+KeyA"))) .put("muteothers", getHotkey(getString(CONFIG_KEYCODE_MUTE_OTHERS, "Shift+F12"))) .put("mute", getHotkey(getString(CONFIG_KEYCODE_MUTE, "Shift+F7"))) .put("quickpoll", getHotkey(getString(CONFIG_KEYCODE_QUICKPOLL, "Ctrl+Alt+KeyQ"))) diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index d7f19b4..2607599 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -53,6 +53,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_GOOGLE_A import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_CSP; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_ARRANGE; +import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_ARRANGE_RESIZE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_MUTE; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_MUTE_OTHERS; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_KEYCODE_QUICKPOLL; @@ -357,6 +358,8 @@ public class ImportInitvalues { addCfg(list, CONFIG_KEYCODE_QUICKPOLL, "Ctrl+Alt+KeyQ", Configuration.Type.HOTKEY , "A hot key code to start quick poll", "4.0.10"); addCfg(list, CONFIG_AUTO_OPEN_SHARING, String.valueOf(false), Configuration.Type.BOOL, "Whether shared screen should be auto-opened.", VER_5_0_0); + addCfg(list, CONFIG_KEYCODE_ARRANGE_RESIZE, "Ctrl+Shift+KeyA", Configuration.Type.HOTKEY + , "A hot key code to arrange video windows bottom-to-top with resize to 120x90", VER_5_0_0); return list; } public void loadConfiguration(InstallationConfig cfg) { diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index 2c7f647..544ddd6 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -97,6 +97,7 @@ public class OpenmeetingsVariables { public static final String CONFIG_DISPLAY_NAME_EDITABLE = "display.name.editable"; public static final String CONFIG_KEYCODE_QUICKPOLL = "start.quickpoll.keycode"; public static final String CONFIG_AUTO_OPEN_SHARING = "auto.open.sharing"; + public static final String CONFIG_KEYCODE_ARRANGE_RESIZE = "video.arrange.resize.keycode"; public static final String HEADER_XFRAME_SELF = "'self'"; public static final String HEADER_CSP_SELF = "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; media-src 'self' blob:;";
