ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sundar-Gandu
2021-12-18 13:25:40 -05:00
parent da4e851de2 d5a84f4a27
commit ceda54af2e
3 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/Dependencies.kt
View File

@@ -25,9 +25,9 @@
object ProjectVersions { object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.8.7" const val rlVersion = "1.8.7.1"
const val openosrsVersion = "4.17.0" const val openosrsVersion = "4.17.1"
const val rsversion = 202 const val rsversion = 202
const val cacheversion = 165 const val cacheversion = 165

9
runelite-client/src/main/java/net/runelite/client/Notifier.java
View File

@@ -92,8 +92,6 @@ public class Notifier
} }
} }
// Default timeout of notification in milliseconds
private static final int DEFAULT_TIMEOUT = 10000;
private static final String DOUBLE_QUOTE = "\""; private static final String DOUBLE_QUOTE = "\"";
private static final Escaper SHELL_ESCAPE = Escapers.builder() private static final Escaper SHELL_ESCAPE = Escapers.builder()
.addEscape('"', "'") .addEscape('"', "'")
@@ -320,8 +318,11 @@ public class Notifier
commands.add(SHELL_ESCAPE.escape(notifyIconPath.toAbsolutePath().toString())); commands.add(SHELL_ESCAPE.escape(notifyIconPath.toAbsolutePath().toString()));
commands.add("-u"); commands.add("-u");
commands.add(toUrgency(type)); commands.add(toUrgency(type));
commands.add("-t"); if (runeLiteConfig.notificationTimeout() > 0)
commands.add(String.valueOf(DEFAULT_TIMEOUT)); {
commands.add("-t");
commands.add(String.valueOf(runeLiteConfig.notificationTimeout()));
}
executorService.submit(() -> executorService.submit(() ->
{ {

21
runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java
View File

@@ -221,11 +221,24 @@ public interface RuneLiteConfig extends Config
return Notifier.NativeCustomOff.NATIVE; return Notifier.NativeCustomOff.NATIVE;
} }
@ConfigItem(
keyName = "notificationTimeout",
name = "Notification timeout",
description = "How long notification will be shown in milliseconds. A value of 0 will make it use the system configuration. (Linux only)",
position = 23,
section = notificationSettings
)
@Units(Units.MILLISECONDS)
default int notificationTimeout()
{
return 10000;
}
@ConfigItem( @ConfigItem(
keyName = "notificationGameMessage", keyName = "notificationGameMessage",
name = "Game message notifications", name = "Game message notifications",
description = "Adds a notification message to the chatbox", description = "Adds a notification message to the chatbox",
position = 23, position = 24,
section = notificationSettings section = notificationSettings
) )
default boolean enableGameMessageNotification() default boolean enableGameMessageNotification()
@@ -237,7 +250,7 @@ public interface RuneLiteConfig extends Config
keyName = "flashNotification", keyName = "flashNotification",
name = "Flash", name = "Flash",
description = "Flashes the game frame as a notification", description = "Flashes the game frame as a notification",
position = 24, position = 25,
section = notificationSettings section = notificationSettings
) )
default FlashNotification flashNotification() default FlashNotification flashNotification()
@@ -249,7 +262,7 @@ public interface RuneLiteConfig extends Config
keyName = "notificationFocused", keyName = "notificationFocused",
name = "Send notifications when focused", name = "Send notifications when focused",
description = "Toggles all notifications for when the client is focused", description = "Toggles all notifications for when the client is focused",
position = 25, position = 26,
section = notificationSettings section = notificationSettings
) )
default boolean sendNotificationsWhenFocused() default boolean sendNotificationsWhenFocused()
@@ -262,7 +275,7 @@ public interface RuneLiteConfig extends Config
keyName = "notificationFlashColor", keyName = "notificationFlashColor",
name = "Notification Flash", name = "Notification Flash",
description = "Sets the color of the notification flashes.", description = "Sets the color of the notification flashes.",
position = 26, position = 27,
section = notificationSettings section = notificationSettings
) )
default Color notificationFlashColor() default Color notificationFlashColor()