mirror of
https://github.com/chylex/TweetDuck.git
synced 2025-09-14 19:32:10 +02:00
Compare commits
29 Commits
Author | SHA1 | Date | |
---|---|---|---|
e50480aa35 | |||
6943c7813f | |||
7c9b4382ca | |||
3187f97592 | |||
b71a367052 | |||
2d4bbf2a6f | |||
6e59dfddcc | |||
bd92fc6ee0 | |||
2f61de7025 | |||
8fcec7ec7c | |||
33d9ba3871 | |||
4f8c778ba0 | |||
804c739038 | |||
a0445fbb12 | |||
7ab5d7b796 | |||
7f83a7773b | |||
fc9e8a808f | |||
5ab8976bc7 | |||
e2a28f2811 | |||
137a20ed0e | |||
f956f696f4 | |||
bb7cbde38f | |||
8c452d3fa2 | |||
f65c33c432 | |||
da2758ccb1 | |||
de10112b7f | |||
301d4fb171 | |||
f0a79add14 | |||
d33bc9fe25 |
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using TweetDuck.Core.Controls;
|
||||
@@ -10,7 +11,9 @@ using TweetDuck.Data.Serialization;
|
||||
|
||||
namespace TweetDuck.Configuration{
|
||||
sealed class UserConfig{
|
||||
private static readonly FileSerializer<UserConfig> Serializer = new FileSerializer<UserConfig>();
|
||||
private static readonly FileSerializer<UserConfig> Serializer = new FileSerializer<UserConfig>{
|
||||
HandleUnknownProperties = FileSerializer<UserConfig>.IgnoreProperties("AppLocale")
|
||||
};
|
||||
|
||||
static UserConfig(){
|
||||
Serializer.RegisterTypeConverter(typeof(WindowState), WindowState.Converter);
|
||||
@@ -44,6 +47,7 @@ namespace TweetDuck.Configuration{
|
||||
public bool ExpandLinksOnHover { get; set; } = true;
|
||||
public bool SwitchAccountSelectors { get; set; } = true;
|
||||
public bool OpenSearchInFirstColumn { get; set; } = true;
|
||||
public bool KeepLikeFollowDialogsOpen { get; set; } = true;
|
||||
public bool BestImageQuality { get; set; } = true;
|
||||
public bool EnableAnimatedImages { get; set; } = true;
|
||||
public int VideoPlayerVolume { get; set; } = 50;
|
||||
@@ -51,7 +55,7 @@ namespace TweetDuck.Configuration{
|
||||
private bool _muteNotifications;
|
||||
|
||||
public bool EnableSpellCheck { get; set; } = false;
|
||||
public string AppLocale { get; set; } = "en-US";
|
||||
public string SpellCheckLanguage { get; set; } = "en-US";
|
||||
public string TranslationTarget { get; set; } = "en";
|
||||
|
||||
private TrayIcon.Behavior _trayBehavior = TrayIcon.Behavior.Disabled;
|
||||
@@ -79,8 +83,8 @@ namespace TweetDuck.Configuration{
|
||||
public Size CustomNotificationSize { get; set; } = Size.Empty;
|
||||
public int NotificationScrollSpeed { get; set; } = 100;
|
||||
|
||||
public int NotificationSoundVolume { get; set; } = 100;
|
||||
private string _notificationSoundPath;
|
||||
private int _notificationSoundVolume = 100;
|
||||
|
||||
public string CustomCefArgs { get; set; } = null;
|
||||
public string CustomBrowserCSS { get; set; } = null;
|
||||
@@ -90,45 +94,33 @@ namespace TweetDuck.Configuration{
|
||||
|
||||
public bool IsCustomNotificationPositionSet => CustomNotificationPosition != ControlExtensions.InvisibleLocation;
|
||||
public bool IsCustomNotificationSizeSet => CustomNotificationSize != Size.Empty;
|
||||
public bool IsCustomSoundNotificationSet => NotificationSoundPath != string.Empty;
|
||||
|
||||
public TwitterUtils.ImageQuality TwitterImageQuality => BestImageQuality ? TwitterUtils.ImageQuality.Orig : TwitterUtils.ImageQuality.Default;
|
||||
|
||||
public string NotificationSoundPath{
|
||||
get => string.IsNullOrEmpty(_notificationSoundPath) ? string.Empty : _notificationSoundPath;
|
||||
set => _notificationSoundPath = value;
|
||||
get => _notificationSoundPath ?? string.Empty;
|
||||
set => UpdatePropertyWithEvent(ref _notificationSoundPath, value, SoundNotificationChanged);
|
||||
}
|
||||
|
||||
public int NotificationSoundVolume{
|
||||
get => _notificationSoundVolume;
|
||||
set => UpdatePropertyWithEvent(ref _notificationSoundVolume, value, SoundNotificationChanged);
|
||||
}
|
||||
|
||||
public bool MuteNotifications{
|
||||
get => _muteNotifications;
|
||||
|
||||
set{
|
||||
if (_muteNotifications != value){
|
||||
_muteNotifications = value;
|
||||
MuteToggled?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
set => UpdatePropertyWithEvent(ref _muteNotifications, value, MuteToggled);
|
||||
}
|
||||
|
||||
public int ZoomLevel{
|
||||
get => _zoomLevel;
|
||||
|
||||
set{
|
||||
if (_zoomLevel != value){
|
||||
_zoomLevel = value;
|
||||
ZoomLevelChanged?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
set => UpdatePropertyWithEvent(ref _zoomLevel, value, ZoomLevelChanged);
|
||||
}
|
||||
|
||||
public TrayIcon.Behavior TrayBehavior{
|
||||
get => _trayBehavior;
|
||||
|
||||
set{
|
||||
if (_trayBehavior != value){
|
||||
_trayBehavior = value;
|
||||
TrayBehaviorChanged?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
set => UpdatePropertyWithEvent(ref _trayBehavior, value, TrayBehaviorChanged);
|
||||
}
|
||||
|
||||
// EVENTS
|
||||
@@ -136,6 +128,7 @@ namespace TweetDuck.Configuration{
|
||||
public event EventHandler MuteToggled;
|
||||
public event EventHandler ZoomLevelChanged;
|
||||
public event EventHandler TrayBehaviorChanged;
|
||||
public event EventHandler SoundNotificationChanged;
|
||||
|
||||
// END OF CONFIG
|
||||
|
||||
@@ -145,6 +138,13 @@ namespace TweetDuck.Configuration{
|
||||
this.file = file;
|
||||
}
|
||||
|
||||
private void UpdatePropertyWithEvent<T>(ref T field, T value, EventHandler eventHandler){
|
||||
if (!EqualityComparer<T>.Default.Equals(field, value)){
|
||||
field = value;
|
||||
eventHandler?.Invoke(this, EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
|
||||
public void Save(){
|
||||
try{
|
||||
if (File.Exists(file)){
|
||||
|
@@ -17,8 +17,8 @@ namespace TweetDuck.Core.Bridge{
|
||||
if (environment == Environment.Browser){
|
||||
build.Append("x.switchAccountSelectors=").Append(Bool(Program.UserConfig.SwitchAccountSelectors));
|
||||
build.Append("x.openSearchInFirstColumn=").Append(Bool(Program.UserConfig.OpenSearchInFirstColumn));
|
||||
build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(Program.UserConfig.KeepLikeFollowDialogsOpen));
|
||||
build.Append("x.muteNotifications=").Append(Bool(Program.UserConfig.MuteNotifications));
|
||||
build.Append("x.hasCustomNotificationSound=").Append(Bool(Program.UserConfig.NotificationSoundPath.Length > 0));
|
||||
build.Append("x.notificationMediaPreviews=").Append(Bool(Program.UserConfig.NotificationMediaPreviews));
|
||||
build.Append("x.translationTarget=").Append(Str(Program.UserConfig.TranslationTarget));
|
||||
}
|
||||
|
@@ -10,7 +10,7 @@ using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Resources;
|
||||
|
||||
namespace TweetDuck.Core.Bridge{
|
||||
sealed class TweetDeckBridge{
|
||||
class TweetDeckBridge{
|
||||
public static string FontSize { get; private set; }
|
||||
public static string NotificationHeadLayout { get; private set; }
|
||||
|
||||
@@ -45,11 +45,20 @@ namespace TweetDuck.Core.Bridge{
|
||||
private readonly FormBrowser form;
|
||||
private readonly FormNotificationMain notification;
|
||||
|
||||
public TweetDeckBridge(FormBrowser form, FormNotificationMain notification){
|
||||
protected TweetDeckBridge(FormBrowser form, FormNotificationMain notification){
|
||||
this.form = form;
|
||||
this.notification = notification;
|
||||
}
|
||||
|
||||
// Browser only
|
||||
|
||||
public sealed class Browser : TweetDeckBridge{
|
||||
public Browser(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
|
||||
|
||||
public void OpenContextMenu(){
|
||||
form.InvokeAsyncSafe(form.OpenContextMenu);
|
||||
}
|
||||
|
||||
public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
|
||||
form.InvokeAsyncSafe(() => {
|
||||
form.OnIntroductionClosed(showGuide, allowDataCollection);
|
||||
@@ -63,10 +72,6 @@ namespace TweetDuck.Core.Bridge{
|
||||
});
|
||||
}
|
||||
|
||||
public void SetLastRightClickInfo(string type, string link){
|
||||
form.InvokeAsyncSafe(() => ContextMenuBase.SetContextInfo(type, link));
|
||||
}
|
||||
|
||||
public void SetLastHighlightedTweet(string tweetUrl, string quoteUrl, string authors, string imageList){
|
||||
form.InvokeAsyncSafe(() => {
|
||||
LastHighlightedTweetUrl = tweetUrl;
|
||||
@@ -76,8 +81,39 @@ namespace TweetDuck.Core.Bridge{
|
||||
});
|
||||
}
|
||||
|
||||
public void OpenContextMenu(){
|
||||
form.InvokeAsyncSafe(form.OpenContextMenu);
|
||||
public void DisplayTooltip(string text){
|
||||
form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
|
||||
}
|
||||
|
||||
public void SetSessionData(string key, string value){
|
||||
form.InvokeSafe(() => { // do not use InvokeAsyncSafe, return only after invocation
|
||||
SessionData.Add(key, value);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// Notification only
|
||||
|
||||
public sealed class Notification : TweetDeckBridge{
|
||||
public Notification(FormBrowser form, FormNotificationMain notification) : base(form, notification){}
|
||||
|
||||
public void DisplayTooltip(string text){
|
||||
notification.InvokeAsyncSafe(() => notification.DisplayTooltip(text));
|
||||
}
|
||||
|
||||
public void LoadNextNotification(){
|
||||
notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
|
||||
}
|
||||
|
||||
public void ShowTweetDetail(){
|
||||
notification.InvokeAsyncSafe(notification.ShowTweetDetail);
|
||||
}
|
||||
}
|
||||
|
||||
// Global
|
||||
|
||||
public void SetLastRightClickInfo(string type, string link){
|
||||
form.InvokeAsyncSafe(() => ContextMenuBase.SetContextInfo(type, link));
|
||||
}
|
||||
|
||||
public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
|
||||
@@ -90,29 +126,10 @@ namespace TweetDuck.Core.Bridge{
|
||||
public void OnTweetSound(){
|
||||
form.InvokeAsyncSafe(() => {
|
||||
form.OnTweetNotification();
|
||||
form.PlayNotificationSound();
|
||||
form.OnTweetSound();
|
||||
});
|
||||
}
|
||||
|
||||
public void DisplayTooltip(string text, bool showInNotification){
|
||||
if (showInNotification){
|
||||
notification.InvokeAsyncSafe(() => notification.DisplayTooltip(text));
|
||||
}
|
||||
else{
|
||||
form.InvokeAsyncSafe(() => form.DisplayTooltip(text));
|
||||
}
|
||||
}
|
||||
|
||||
public void SetSessionData(string key, string value){
|
||||
form.InvokeSafe(() => { // do not use InvokeAsyncSafe, return only after invocation
|
||||
SessionData.Add(key, value);
|
||||
});
|
||||
}
|
||||
|
||||
public void LoadNextNotification(){
|
||||
notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
|
||||
}
|
||||
|
||||
public void ScreenshotTweet(string html, int width, int height){
|
||||
form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width, height));
|
||||
}
|
||||
|
@@ -15,7 +15,6 @@ using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Plugins;
|
||||
using TweetDuck.Plugins.Events;
|
||||
using TweetDuck.Updates;
|
||||
using TweetLib.Audio;
|
||||
|
||||
namespace TweetDuck.Core{
|
||||
sealed partial class FormBrowser : Form{
|
||||
@@ -50,7 +49,6 @@ namespace TweetDuck.Core{
|
||||
private FormWindowState prevState;
|
||||
|
||||
private TweetScreenshotManager notificationScreenshotManager;
|
||||
private SoundNotification soundNotification;
|
||||
private VideoPlayer videoPlayer;
|
||||
private AnalyticsManager analytics;
|
||||
|
||||
@@ -67,7 +65,7 @@ namespace TweetDuck.Core{
|
||||
this.notification = new FormNotificationTweet(this, plugins);
|
||||
this.notification.Show();
|
||||
|
||||
this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge(this, notification));
|
||||
this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification));
|
||||
this.browser.PageLoaded += browser_PageLoaded;
|
||||
|
||||
this.contextMenu = ContextMenuBrowser.CreateMenu(this);
|
||||
@@ -82,7 +80,6 @@ namespace TweetDuck.Core{
|
||||
contextMenu.Dispose();
|
||||
|
||||
notificationScreenshotManager?.Dispose();
|
||||
soundNotification?.Dispose();
|
||||
videoPlayer?.Dispose();
|
||||
analytics?.Dispose();
|
||||
};
|
||||
@@ -291,22 +288,6 @@ namespace TweetDuck.Core{
|
||||
});
|
||||
}
|
||||
|
||||
private void soundNotification_PlaybackError(object sender, PlaybackErrorEventArgs e){
|
||||
e.Ignore = true;
|
||||
|
||||
using(FormMessage form = new FormMessage("Notification Sound Error", "Could not play custom notification sound.\n"+e.Message, MessageBoxIcon.Error)){
|
||||
form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
|
||||
|
||||
Button btnOpenSettings = form.AddButton("View Options");
|
||||
btnOpenSettings.Width += 16;
|
||||
btnOpenSettings.Location = new Point(btnOpenSettings.Location.X-16, btnOpenSettings.Location.Y);
|
||||
|
||||
if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnOpenSettings){
|
||||
OpenSettings(typeof(TabSettingsSounds));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void WndProc(ref Message m){
|
||||
if (isLoaded && m.Msg == Program.WindowRestoreMessage){
|
||||
if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
|
||||
@@ -357,6 +338,10 @@ namespace TweetDuck.Core{
|
||||
browser.ReloadColumns();
|
||||
}
|
||||
|
||||
public void PlaySoundNotification(){
|
||||
browser.PlaySoundNotification();
|
||||
}
|
||||
|
||||
public void ApplyROT13(){
|
||||
browser.ApplyROT13();
|
||||
}
|
||||
@@ -459,19 +444,7 @@ namespace TweetDuck.Core{
|
||||
}
|
||||
}
|
||||
|
||||
public void PlayNotificationSound(){
|
||||
if (Config.NotificationSoundPath.Length == 0){
|
||||
return;
|
||||
}
|
||||
|
||||
if (soundNotification == null){
|
||||
soundNotification = new SoundNotification();
|
||||
soundNotification.PlaybackError += soundNotification_PlaybackError;
|
||||
}
|
||||
|
||||
soundNotification.SetVolume(Config.NotificationSoundVolume);
|
||||
soundNotification.Play(Config.NotificationSoundPath);
|
||||
|
||||
public void OnTweetSound(){
|
||||
TriggerAnalyticsEvent(AnalyticsFile.Event.SoundNotification);
|
||||
}
|
||||
|
||||
|
@@ -11,6 +11,7 @@ namespace TweetDuck.Core.Handling.General{
|
||||
private static void UpdatePrefsInternal(){
|
||||
using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
|
||||
ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);
|
||||
ctx.SetPreference("spellcheck.dictionary", Program.UserConfig.SpellCheckLanguage, out string _);
|
||||
ctx.SetPreference("settings.a11y.animation_policy", Program.UserConfig.EnableAnimatedImages ? "allowed" : "none", out string _);
|
||||
}
|
||||
}
|
||||
|
@@ -1,4 +1,5 @@
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Plugins;
|
||||
using TweetDuck.Resources;
|
||||
|
||||
@@ -32,6 +33,10 @@ namespace TweetDuck.Core.Notification.Example{
|
||||
exampleNotification = TweetNotification.Example(exampleTweetHTML, 95);
|
||||
}
|
||||
|
||||
public override void HideNotification(){
|
||||
Location = ControlExtensions.InvisibleLocation;
|
||||
}
|
||||
|
||||
public void ShowExampleNotification(bool reset){
|
||||
if (reset){
|
||||
LoadTweet(exampleNotification);
|
||||
|
@@ -139,8 +139,7 @@ namespace TweetDuck.Core.Notification{
|
||||
|
||||
DpiScale = this.GetDPIScale();
|
||||
|
||||
DefaultResourceHandlerFactory handlerFactory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
|
||||
handlerFactory.RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
|
||||
browser.GetHandlerFactory().RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
|
||||
|
||||
Controls.Add(browser);
|
||||
|
||||
@@ -181,6 +180,8 @@ namespace TweetDuck.Core.Notification{
|
||||
|
||||
public virtual void HideNotification(){
|
||||
browser.Load("about:blank");
|
||||
DisplayTooltip(null);
|
||||
|
||||
Location = ControlExtensions.InvisibleLocation;
|
||||
currentNotification = null;
|
||||
}
|
||||
@@ -206,7 +207,9 @@ namespace TweetDuck.Core.Notification{
|
||||
protected virtual void LoadTweet(TweetNotification tweet){
|
||||
currentNotification = tweet;
|
||||
resourceHandler.SetHTML(GetTweetHTML(tweet));
|
||||
|
||||
browser.Load(TwitterUtils.TweetDeckURL);
|
||||
DisplayTooltip(null);
|
||||
}
|
||||
|
||||
protected virtual void SetNotificationSize(int width, int height){
|
||||
|
@@ -83,7 +83,7 @@ namespace TweetDuck.Core.Notification{
|
||||
|
||||
browser.KeyboardHandler = new KeyboardHandlerNotification(this);
|
||||
|
||||
browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(owner, this));
|
||||
browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge.Notification(owner, this));
|
||||
browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
|
||||
|
||||
browser.LoadingStateChanged += Browser_LoadingStateChanged;
|
||||
|
@@ -1,32 +1,53 @@
|
||||
using System;
|
||||
using TweetLib.Audio;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
using System.Windows.Forms;
|
||||
using CefSharp;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Other;
|
||||
using TweetDuck.Core.Other.Settings;
|
||||
|
||||
namespace TweetDuck.Core.Notification{
|
||||
sealed class SoundNotification : IDisposable{
|
||||
public string SupportedFormats => player.SupportedFormats;
|
||||
public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
|
||||
static class SoundNotification{
|
||||
public const string SupportedFormats = "*.wav;*.ogg;*.flac;*.opus;*.weba;*.webm"; // TODO add mp3 when supported
|
||||
|
||||
private readonly AudioPlayer player;
|
||||
public static IResourceHandler CreateFileHandler(string path){
|
||||
string mimeType;
|
||||
|
||||
public SoundNotification(){
|
||||
this.player = AudioPlayer.New();
|
||||
this.player.PlaybackError += Player_PlaybackError;
|
||||
switch(Path.GetExtension(path)){
|
||||
case ".weba":
|
||||
case ".webm": mimeType = "audio/webm"; break;
|
||||
case ".wav": mimeType = "audio/wav"; break;
|
||||
case ".ogg": mimeType = "audio/ogg"; break;
|
||||
case ".flac": mimeType = "audio/flac"; break;
|
||||
case ".opus": mimeType = "audio/ogg; codecs=opus"; break;
|
||||
case ".mp3": TryShowError("MP3 sound notifications are temporarily unsupported, please convert the file to another format, such as .ogg, .wav, or .flac."); return null;
|
||||
default: mimeType = null; break;
|
||||
}
|
||||
|
||||
public void Play(string file){
|
||||
player.Play(file);
|
||||
try{
|
||||
return ResourceHandler.FromFilePath(path, mimeType);
|
||||
}catch{
|
||||
TryShowError("Could not find custom notification sound file:\n"+path);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public bool SetVolume(int volume){
|
||||
return player.SetVolume(volume);
|
||||
}
|
||||
private static void TryShowError(string message){
|
||||
FormBrowser browser = FormManager.TryFind<FormBrowser>();
|
||||
|
||||
private void Player_PlaybackError(object sender, PlaybackErrorEventArgs e){
|
||||
PlaybackError?.Invoke(this, e);
|
||||
}
|
||||
browser?.InvokeAsyncSafe(() => {
|
||||
using(FormMessage form = new FormMessage("Sound Notification Error", message, MessageBoxIcon.Error)){
|
||||
form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
|
||||
|
||||
public void Dispose(){
|
||||
player.Dispose();
|
||||
Button btnViewOptions = form.AddButton("View Options");
|
||||
btnViewOptions.Width += 16;
|
||||
btnViewOptions.Location = new Point(btnViewOptions.Location.X-16, btnViewOptions.Location.Y);
|
||||
|
||||
if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
|
||||
browser.OpenSettings(typeof(TabSettingsSounds));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -41,6 +41,7 @@ namespace TweetDuck.Core.Other.Analytics{
|
||||
{ "Expand Links" , Bool(UserConfig.ExpandLinksOnHover) },
|
||||
{ "Switch Account Selectors" , Bool(UserConfig.SwitchAccountSelectors) },
|
||||
{ "Search In First Column" , Bool(UserConfig.OpenSearchInFirstColumn) },
|
||||
{ "Keep Like Follow Dialogs Open" , Bool(UserConfig.KeepLikeFollowDialogsOpen) },
|
||||
{ "Best Image Quality" , Bool(UserConfig.BestImageQuality) },
|
||||
{ "Spell Check" , Bool(UserConfig.EnableSpellCheck) },
|
||||
{ "Zoom" , Exact(UserConfig.ZoomLevel) },
|
||||
|
@@ -9,6 +9,7 @@ using TweetDuck.Core.Handling.General;
|
||||
using TweetDuck.Core.Other.Analytics;
|
||||
using TweetDuck.Core.Utils;
|
||||
using System.Text.RegularExpressions;
|
||||
using TweetDuck.Resources;
|
||||
|
||||
namespace TweetDuck.Core.Other{
|
||||
sealed partial class FormGuide : Form{
|
||||
@@ -73,6 +74,7 @@ namespace TweetDuck.Core.Other{
|
||||
|
||||
browser.LoadingStateChanged += browser_LoadingStateChanged;
|
||||
browser.FrameLoadStart += browser_FrameLoadStart;
|
||||
browser.FrameLoadEnd += browser_FrameLoadEnd;
|
||||
|
||||
browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
|
||||
browser.Dock = DockStyle.None;
|
||||
@@ -110,6 +112,11 @@ namespace TweetDuck.Core.Other{
|
||||
BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
|
||||
}
|
||||
|
||||
private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
|
||||
// idiot chromium
|
||||
ScriptLoader.ExecuteScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
|
||||
}
|
||||
|
||||
private void Config_ZoomLevelChanged(object sender, EventArgs e){
|
||||
BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
|
||||
}
|
||||
|
@@ -40,7 +40,7 @@ namespace TweetDuck.Core.Other{
|
||||
AddButton("Locales", () => new TabSettingsLocales());
|
||||
AddButton("System Tray", () => new TabSettingsTray());
|
||||
AddButton("Notifications", () => new TabSettingsNotifications(new FormNotificationExample(this.browser, this.plugins)));
|
||||
AddButton("Sounds", () => new TabSettingsSounds());
|
||||
AddButton("Sounds", () => new TabSettingsSounds(this.browser.PlaySoundNotification));
|
||||
AddButton("Feedback", () => new TabSettingsFeedback(analytics, AnalyticsReportGenerator.ExternalInfo.From(this.browser), this.plugins));
|
||||
AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS));
|
||||
|
||||
|
32
Core/Other/Settings/TabSettingsGeneral.Designer.cs
generated
32
Core/Other/Settings/TabSettingsGeneral.Designer.cs
generated
@@ -40,6 +40,7 @@
|
||||
this.checkAnimatedAvatars = new System.Windows.Forms.CheckBox();
|
||||
this.labelUpdates = new System.Windows.Forms.Label();
|
||||
this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.checkKeepLikeFollowDialogsOpen = new System.Windows.Forms.CheckBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
|
||||
this.panelZoom.SuspendLayout();
|
||||
this.flowPanel.SuspendLayout();
|
||||
@@ -59,7 +60,7 @@
|
||||
// checkUpdateNotifications
|
||||
//
|
||||
this.checkUpdateNotifications.AutoSize = true;
|
||||
this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 245);
|
||||
this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 268);
|
||||
this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkUpdateNotifications.Name = "checkUpdateNotifications";
|
||||
this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
|
||||
@@ -69,7 +70,7 @@
|
||||
//
|
||||
// btnCheckUpdates
|
||||
//
|
||||
this.btnCheckUpdates.Location = new System.Drawing.Point(5, 268);
|
||||
this.btnCheckUpdates.Location = new System.Drawing.Point(5, 291);
|
||||
this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.btnCheckUpdates.Name = "btnCheckUpdates";
|
||||
this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
|
||||
@@ -102,7 +103,7 @@
|
||||
// checkBestImageQuality
|
||||
//
|
||||
this.checkBestImageQuality.AutoSize = true;
|
||||
this.checkBestImageQuality.Location = new System.Drawing.Point(6, 95);
|
||||
this.checkBestImageQuality.Location = new System.Drawing.Point(6, 118);
|
||||
this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkBestImageQuality.Name = "checkBestImageQuality";
|
||||
this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
|
||||
@@ -139,7 +140,7 @@
|
||||
// labelZoom
|
||||
//
|
||||
this.labelZoom.AutoSize = true;
|
||||
this.labelZoom.Location = new System.Drawing.Point(3, 150);
|
||||
this.labelZoom.Location = new System.Drawing.Point(3, 173);
|
||||
this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelZoom.Name = "labelZoom";
|
||||
this.labelZoom.Size = new System.Drawing.Size(34, 13);
|
||||
@@ -167,7 +168,7 @@
|
||||
this.panelZoom.Anchor = System.Windows.Forms.AnchorStyles.Top;
|
||||
this.panelZoom.Controls.Add(this.trackBarZoom);
|
||||
this.panelZoom.Controls.Add(this.labelZoomValue);
|
||||
this.panelZoom.Location = new System.Drawing.Point(0, 163);
|
||||
this.panelZoom.Location = new System.Drawing.Point(0, 186);
|
||||
this.panelZoom.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelZoom.Name = "panelZoom";
|
||||
this.panelZoom.Size = new System.Drawing.Size(322, 36);
|
||||
@@ -176,7 +177,7 @@
|
||||
// checkAnimatedAvatars
|
||||
//
|
||||
this.checkAnimatedAvatars.AutoSize = true;
|
||||
this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 118);
|
||||
this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 141);
|
||||
this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
|
||||
this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
|
||||
@@ -188,7 +189,7 @@
|
||||
//
|
||||
this.labelUpdates.AutoSize = true;
|
||||
this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
|
||||
this.labelUpdates.Location = new System.Drawing.Point(0, 219);
|
||||
this.labelUpdates.Location = new System.Drawing.Point(0, 242);
|
||||
this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelUpdates.Name = "labelUpdates";
|
||||
this.labelUpdates.Size = new System.Drawing.Size(70, 20);
|
||||
@@ -204,6 +205,7 @@
|
||||
this.flowPanel.Controls.Add(this.checkExpandLinks);
|
||||
this.flowPanel.Controls.Add(this.checkSwitchAccountSelectors);
|
||||
this.flowPanel.Controls.Add(this.checkOpenSearchInFirstColumn);
|
||||
this.flowPanel.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
|
||||
this.flowPanel.Controls.Add(this.checkBestImageQuality);
|
||||
this.flowPanel.Controls.Add(this.checkAnimatedAvatars);
|
||||
this.flowPanel.Controls.Add(this.labelZoom);
|
||||
@@ -214,17 +216,28 @@
|
||||
this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 296);
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 319);
|
||||
this.flowPanel.TabIndex = 4;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// checkKeepLikeFollowDialogsOpen
|
||||
//
|
||||
this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
|
||||
this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 95);
|
||||
this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
|
||||
this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(176, 17);
|
||||
this.checkKeepLikeFollowDialogsOpen.TabIndex = 7;
|
||||
this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
|
||||
this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// TabSettingsGeneral
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.flowPanel);
|
||||
this.Name = "TabSettingsGeneral";
|
||||
this.Size = new System.Drawing.Size(340, 314);
|
||||
this.Size = new System.Drawing.Size(340, 337);
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
|
||||
this.panelZoom.ResumeLayout(false);
|
||||
this.flowPanel.ResumeLayout(false);
|
||||
@@ -251,5 +264,6 @@
|
||||
private System.Windows.Forms.CheckBox checkOpenSearchInFirstColumn;
|
||||
private System.Windows.Forms.CheckBox checkAnimatedAvatars;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowPanel;
|
||||
private System.Windows.Forms.CheckBox checkKeepLikeFollowDialogsOpen;
|
||||
}
|
||||
}
|
||||
|
@@ -21,6 +21,7 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
|
||||
toolTip.SetToolTip(checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
|
||||
toolTip.SetToolTip(checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
|
||||
toolTip.SetToolTip(checkKeepLikeFollowDialogsOpen, "Allows liking and following from multiple accounts at once,\r\ninstead of automatically closing the dialog after taking an action.");
|
||||
toolTip.SetToolTip(checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
|
||||
toolTip.SetToolTip(checkAnimatedAvatars, "Some old Twitter avatars could be uploaded as animated GIFs.");
|
||||
|
||||
@@ -36,6 +37,7 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
checkExpandLinks.Checked = Config.ExpandLinksOnHover;
|
||||
checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
|
||||
checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
|
||||
checkKeepLikeFollowDialogsOpen.Checked = Config.KeepLikeFollowDialogsOpen;
|
||||
checkBestImageQuality.Checked = Config.BestImageQuality;
|
||||
checkAnimatedAvatars.Checked = Config.EnableAnimatedImages;
|
||||
|
||||
@@ -46,6 +48,7 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
|
||||
checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
|
||||
checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
|
||||
checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
|
||||
checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
|
||||
checkAnimatedAvatars.CheckedChanged += checkAnimatedAvatars_CheckedChanged;
|
||||
trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
|
||||
@@ -70,6 +73,10 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
Config.OpenSearchInFirstColumn = checkOpenSearchInFirstColumn.Checked;
|
||||
}
|
||||
|
||||
private void checkKeepLikeFollowDialogsOpen_CheckedChanged(object sender, EventArgs e){
|
||||
Config.KeepLikeFollowDialogsOpen = checkKeepLikeFollowDialogsOpen.Checked;
|
||||
}
|
||||
|
||||
private void checkBestImageQuality_CheckedChanged(object sender, EventArgs e){
|
||||
Config.BestImageQuality = checkBestImageQuality.Checked;
|
||||
}
|
||||
|
44
Core/Other/Settings/TabSettingsLocales.Designer.cs
generated
44
Core/Other/Settings/TabSettingsLocales.Designer.cs
generated
@@ -28,8 +28,8 @@
|
||||
this.checkSpellCheck = new System.Windows.Forms.CheckBox();
|
||||
this.labelLocales = new System.Windows.Forms.Label();
|
||||
this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.labelAppLanguage = new System.Windows.Forms.Label();
|
||||
this.comboBoxAppLocale = new System.Windows.Forms.ComboBox();
|
||||
this.labelSpellCheckLanguage = new System.Windows.Forms.Label();
|
||||
this.comboBoxSpellCheckLanguage = new System.Windows.Forms.ComboBox();
|
||||
this.labelTranslations = new System.Windows.Forms.Label();
|
||||
this.labelTranslationTarget = new System.Windows.Forms.Label();
|
||||
this.comboBoxTranslationTarget = new System.Windows.Forms.ComboBox();
|
||||
@@ -65,8 +65,8 @@
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.flowPanel.Controls.Add(this.labelLocales);
|
||||
this.flowPanel.Controls.Add(this.checkSpellCheck);
|
||||
this.flowPanel.Controls.Add(this.labelAppLanguage);
|
||||
this.flowPanel.Controls.Add(this.comboBoxAppLocale);
|
||||
this.flowPanel.Controls.Add(this.labelSpellCheckLanguage);
|
||||
this.flowPanel.Controls.Add(this.comboBoxSpellCheckLanguage);
|
||||
this.flowPanel.Controls.Add(this.labelTranslations);
|
||||
this.flowPanel.Controls.Add(this.labelTranslationTarget);
|
||||
this.flowPanel.Controls.Add(this.comboBoxTranslationTarget);
|
||||
@@ -77,25 +77,25 @@
|
||||
this.flowPanel.TabIndex = 4;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// labelAppLanguage
|
||||
// labelSpellCheckLanguage
|
||||
//
|
||||
this.labelAppLanguage.AutoSize = true;
|
||||
this.labelAppLanguage.Location = new System.Drawing.Point(3, 58);
|
||||
this.labelAppLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelAppLanguage.Name = "labelAppLanguage";
|
||||
this.labelAppLanguage.Size = new System.Drawing.Size(77, 13);
|
||||
this.labelAppLanguage.TabIndex = 11;
|
||||
this.labelAppLanguage.Text = "App Language";
|
||||
this.labelSpellCheckLanguage.AutoSize = true;
|
||||
this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 58);
|
||||
this.labelSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelSpellCheckLanguage.Name = "labelSpellCheckLanguage";
|
||||
this.labelSpellCheckLanguage.Size = new System.Drawing.Size(115, 13);
|
||||
this.labelSpellCheckLanguage.TabIndex = 11;
|
||||
this.labelSpellCheckLanguage.Text = "Spell Check Language";
|
||||
//
|
||||
// comboBoxAppLocale
|
||||
// comboBoxSpellCheckLanguage
|
||||
//
|
||||
this.comboBoxAppLocale.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBoxAppLocale.FormattingEnabled = true;
|
||||
this.comboBoxAppLocale.Location = new System.Drawing.Point(5, 74);
|
||||
this.comboBoxAppLocale.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.comboBoxAppLocale.Name = "comboBoxAppLocale";
|
||||
this.comboBoxAppLocale.Size = new System.Drawing.Size(311, 21);
|
||||
this.comboBoxAppLocale.TabIndex = 9;
|
||||
this.comboBoxSpellCheckLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBoxSpellCheckLanguage.FormattingEnabled = true;
|
||||
this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 74);
|
||||
this.comboBoxSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.comboBoxSpellCheckLanguage.Name = "comboBoxSpellCheckLanguage";
|
||||
this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(311, 21);
|
||||
this.comboBoxSpellCheckLanguage.TabIndex = 9;
|
||||
//
|
||||
// labelTranslations
|
||||
//
|
||||
@@ -148,8 +148,8 @@
|
||||
private System.Windows.Forms.FlowLayoutPanel flowPanel;
|
||||
private System.Windows.Forms.ComboBox comboBoxTranslationTarget;
|
||||
private System.Windows.Forms.Label labelTranslationTarget;
|
||||
private System.Windows.Forms.ComboBox comboBoxAppLocale;
|
||||
private System.Windows.Forms.ComboBox comboBoxSpellCheckLanguage;
|
||||
private System.Windows.Forms.Label labelTranslations;
|
||||
private System.Windows.Forms.Label labelAppLanguage;
|
||||
private System.Windows.Forms.Label labelSpellCheckLanguage;
|
||||
}
|
||||
}
|
||||
|
@@ -8,20 +8,20 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
InitializeComponent();
|
||||
|
||||
toolTip.SetToolTip(checkSpellCheck, "Underlines words that are spelled incorrectly.");
|
||||
toolTip.SetToolTip(comboBoxAppLocale, "Language used for spell check and context menu items.");
|
||||
toolTip.SetToolTip(comboBoxSpellCheckLanguage, "Language used for spell check.");
|
||||
toolTip.SetToolTip(comboBoxTranslationTarget, "Language tweets are translated into.");
|
||||
|
||||
checkSpellCheck.Checked = Config.EnableSpellCheck;
|
||||
|
||||
try{
|
||||
foreach(LocaleUtils.Item item in LocaleUtils.ChromiumLocales){
|
||||
comboBoxAppLocale.Items.Add(item);
|
||||
foreach(LocaleUtils.Item item in LocaleUtils.SpellCheckLanguages){
|
||||
comboBoxSpellCheckLanguage.Items.Add(item);
|
||||
}
|
||||
}catch{
|
||||
comboBoxAppLocale.Items.Add(new LocaleUtils.Item("en-US"));
|
||||
comboBoxSpellCheckLanguage.Items.Add(new LocaleUtils.Item("en-US"));
|
||||
}
|
||||
|
||||
comboBoxAppLocale.SelectedItem = new LocaleUtils.Item(Config.AppLocale);
|
||||
comboBoxSpellCheckLanguage.SelectedItem = new LocaleUtils.Item(Config.SpellCheckLanguage);
|
||||
|
||||
foreach(LocaleUtils.Item item in LocaleUtils.TweetDeckTranslationLocales){
|
||||
comboBoxTranslationTarget.Items.Add(item);
|
||||
@@ -32,7 +32,7 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
|
||||
public override void OnReady(){
|
||||
checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
|
||||
comboBoxAppLocale.SelectedValueChanged += comboBoxAppLocale_SelectedValueChanged;
|
||||
comboBoxSpellCheckLanguage.SelectedValueChanged += comboBoxSpellCheckLanguage_SelectedValueChanged;
|
||||
comboBoxTranslationTarget.SelectedValueChanged += comboBoxTranslationTarget_SelectedValueChanged;
|
||||
}
|
||||
|
||||
@@ -41,8 +41,8 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
BrowserProcessHandler.UpdatePrefs();
|
||||
}
|
||||
|
||||
private void comboBoxAppLocale_SelectedValueChanged(object sender, EventArgs e){
|
||||
Config.AppLocale = (comboBoxAppLocale.SelectedItem as LocaleUtils.Item)?.Code;
|
||||
private void comboBoxSpellCheckLanguage_SelectedValueChanged(object sender, EventArgs e){
|
||||
Config.SpellCheckLanguage = (comboBoxSpellCheckLanguage.SelectedItem as LocaleUtils.Item)?.Code;
|
||||
PromptRestart();
|
||||
}
|
||||
|
||||
|
@@ -36,6 +36,7 @@
|
||||
this.trackBarVolume = new System.Windows.Forms.TrackBar();
|
||||
this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.panelVolume = new System.Windows.Forms.Panel();
|
||||
this.volumeUpdateTimer = new System.Windows.Forms.Timer(this.components);
|
||||
this.panelSoundNotification.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).BeginInit();
|
||||
this.flowPanel.SuspendLayout();
|
||||
@@ -170,6 +171,11 @@
|
||||
this.panelVolume.Size = new System.Drawing.Size(322, 36);
|
||||
this.panelVolume.TabIndex = 2;
|
||||
//
|
||||
// volumeUpdateTimer
|
||||
//
|
||||
this.volumeUpdateTimer.Interval = 250;
|
||||
this.volumeUpdateTimer.Tick += new System.EventHandler(this.volumeUpdateTimer_Tick);
|
||||
//
|
||||
// TabSettingsSounds
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
@@ -201,5 +207,6 @@
|
||||
private System.Windows.Forms.TrackBar trackBarVolume;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowPanel;
|
||||
private System.Windows.Forms.Panel panelVolume;
|
||||
private System.Windows.Forms.Timer volumeUpdateTimer;
|
||||
}
|
||||
}
|
||||
|
@@ -4,25 +4,18 @@ using System.IO;
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Notification;
|
||||
using TweetLib.Audio;
|
||||
|
||||
namespace TweetDuck.Core.Other.Settings{
|
||||
sealed partial class TabSettingsSounds : BaseTabSettings{
|
||||
private readonly SoundNotification soundNotification;
|
||||
private readonly bool supportsChangingVolume;
|
||||
private readonly Action playSoundNotification;
|
||||
|
||||
public TabSettingsSounds(){
|
||||
public TabSettingsSounds(Action playSoundNotification){
|
||||
InitializeComponent();
|
||||
|
||||
soundNotification = new SoundNotification();
|
||||
soundNotification.PlaybackError += sound_PlaybackError;
|
||||
Disposed += (sender, args) => soundNotification.Dispose();
|
||||
|
||||
supportsChangingVolume = soundNotification.SetVolume(Config.NotificationSoundVolume);
|
||||
this.playSoundNotification = playSoundNotification;
|
||||
|
||||
toolTip.SetToolTip(tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
|
||||
|
||||
trackBarVolume.Enabled = supportsChangingVolume && !string.IsNullOrEmpty(Config.NotificationSoundPath);
|
||||
trackBarVolume.SetValueSafe(Config.NotificationSoundVolume);
|
||||
labelVolumeValue.Text = trackBarVolume.Value+"%";
|
||||
|
||||
@@ -39,22 +32,29 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
|
||||
public override void OnClosing(){
|
||||
Config.NotificationSoundPath = tbCustomSound.Text;
|
||||
Config.NotificationSoundVolume = trackBarVolume.Value;
|
||||
}
|
||||
|
||||
private bool RefreshCanPlay(){
|
||||
bool isEmpty = string.IsNullOrEmpty(tbCustomSound.Text);
|
||||
bool canPlay = isEmpty || File.Exists(tbCustomSound.Text);
|
||||
|
||||
tbCustomSound.ForeColor = canPlay ? SystemColors.WindowText : Color.Red;
|
||||
btnPlaySound.Enabled = canPlay;
|
||||
btnResetSound.Enabled = !isEmpty;
|
||||
return canPlay;
|
||||
}
|
||||
|
||||
private void tbCustomSound_TextChanged(object sender, EventArgs e){
|
||||
bool isEmpty = string.IsNullOrEmpty(tbCustomSound.Text);
|
||||
tbCustomSound.ForeColor = isEmpty || File.Exists(tbCustomSound.Text) ? SystemColors.WindowText : Color.Red;
|
||||
btnPlaySound.Enabled = !isEmpty;
|
||||
btnResetSound.Enabled = !isEmpty;
|
||||
trackBarVolume.Enabled = supportsChangingVolume && !isEmpty;
|
||||
RefreshCanPlay();
|
||||
}
|
||||
|
||||
private void btnPlaySound_Click(object sender, EventArgs e){
|
||||
soundNotification.Play(tbCustomSound.Text);
|
||||
if (RefreshCanPlay()){
|
||||
Config.NotificationSoundPath = tbCustomSound.Text;
|
||||
Config.NotificationSoundVolume = trackBarVolume.Value;
|
||||
playSoundNotification();
|
||||
}
|
||||
|
||||
private void sound_PlaybackError(object sender, PlaybackErrorEventArgs e){
|
||||
FormMessage.Error("Notification Sound Error", "Could not play custom notification sound.\n"+e.Message, FormMessage.OK);
|
||||
}
|
||||
|
||||
private void btnBrowseSound_Click(object sender, EventArgs e){
|
||||
@@ -62,7 +62,7 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
AutoUpgradeEnabled = true,
|
||||
DereferenceLinks = true,
|
||||
Title = "Custom Notification Sound",
|
||||
Filter = "Sound file ("+soundNotification.SupportedFormats+")|"+soundNotification.SupportedFormats+"|All files (*.*)|*.*"
|
||||
Filter = $"Sound file ({SoundNotification.SupportedFormats})|{SoundNotification.SupportedFormats}|All files (*.*)|*.*"
|
||||
}){
|
||||
if (dialog.ShowDialog() == DialogResult.OK){
|
||||
tbCustomSound.Text = dialog.FileName;
|
||||
@@ -75,9 +75,14 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
}
|
||||
|
||||
private void trackBarVolume_ValueChanged(object sender, EventArgs e){
|
||||
volumeUpdateTimer.Stop();
|
||||
volumeUpdateTimer.Start();
|
||||
labelVolumeValue.Text = trackBarVolume.Value+"%";
|
||||
}
|
||||
|
||||
private void volumeUpdateTimer_Tick(object sender, EventArgs e){
|
||||
Config.NotificationSoundVolume = trackBarVolume.Value;
|
||||
soundNotification.SetVolume(Config.NotificationSoundVolume);
|
||||
labelVolumeValue.Text = Config.NotificationSoundVolume+"%";
|
||||
volumeUpdateTimer.Stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -7,6 +7,7 @@ using TweetDuck.Core.Bridge;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Handling;
|
||||
using TweetDuck.Core.Handling.General;
|
||||
using TweetDuck.Core.Notification;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Plugins;
|
||||
using TweetDuck.Plugins.Enums;
|
||||
@@ -36,6 +37,8 @@ namespace TweetDuck.Core{
|
||||
private readonly ChromiumWebBrowser browser;
|
||||
private readonly PluginManager plugins;
|
||||
|
||||
private string prevSoundNotificationPath = null;
|
||||
|
||||
public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge bridge){
|
||||
this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
|
||||
DialogHandler = new FileDialogHandler(),
|
||||
@@ -70,6 +73,7 @@ namespace TweetDuck.Core{
|
||||
|
||||
Program.UserConfig.MuteToggled += UserConfig_MuteToggled;
|
||||
Program.UserConfig.ZoomLevelChanged += UserConfig_ZoomLevelChanged;
|
||||
Program.UserConfig.SoundNotificationChanged += UserConfig_SoundNotificationInfoChanged;
|
||||
}
|
||||
|
||||
// setup and management
|
||||
@@ -91,6 +95,7 @@ namespace TweetDuck.Core{
|
||||
|
||||
Program.UserConfig.MuteToggled -= UserConfig_MuteToggled;
|
||||
Program.UserConfig.ZoomLevelChanged -= UserConfig_ZoomLevelChanged;
|
||||
Program.UserConfig.SoundNotificationChanged -= UserConfig_SoundNotificationInfoChanged;
|
||||
|
||||
browser.Dispose();
|
||||
}
|
||||
@@ -129,6 +134,7 @@ namespace TweetDuck.Core{
|
||||
ScriptLoader.ExecuteFile(e.Frame, "code.js");
|
||||
InjectBrowserCSS();
|
||||
ReinjectCustomCSS(Program.UserConfig.CustomBrowserCSS);
|
||||
UserConfig_SoundNotificationInfoChanged(null, EventArgs.Empty);
|
||||
plugins.ExecutePlugins(e.Frame, PluginEnvironment.Browser);
|
||||
|
||||
TweetDeckBridge.ResetStaticProperties();
|
||||
@@ -167,6 +173,27 @@ namespace TweetDuck.Core{
|
||||
BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
|
||||
}
|
||||
|
||||
private void UserConfig_SoundNotificationInfoChanged(object sender, EventArgs e){
|
||||
const string soundUrl = "https://ton.twimg.com/tduck/updatesnd";
|
||||
bool hasCustomSound = Program.UserConfig.IsCustomSoundNotificationSet;
|
||||
|
||||
if (prevSoundNotificationPath != Program.UserConfig.NotificationSoundPath){
|
||||
DefaultResourceHandlerFactory handlerFactory = browser.GetHandlerFactory();
|
||||
IResourceHandler resourceHandler = hasCustomSound ? SoundNotification.CreateFileHandler(Program.UserConfig.NotificationSoundPath) : null;
|
||||
|
||||
if (resourceHandler != null){
|
||||
handlerFactory.RegisterHandler(soundUrl, resourceHandler);
|
||||
}
|
||||
else{
|
||||
handlerFactory.UnregisterHandler(soundUrl);
|
||||
}
|
||||
|
||||
prevSoundNotificationPath = Program.UserConfig.NotificationSoundPath;
|
||||
}
|
||||
|
||||
browser.ExecuteScriptAsync("TDGF_setSoundNotificationData", hasCustomSound, Program.UserConfig.NotificationSoundVolume);
|
||||
}
|
||||
|
||||
// external handling
|
||||
|
||||
public UpdateHandler CreateUpdateHandler(UpdaterSettings settings){
|
||||
@@ -215,6 +242,10 @@ namespace TweetDuck.Core{
|
||||
browser.ExecuteScriptAsync("TDGF_reloadColumns()");
|
||||
}
|
||||
|
||||
public void PlaySoundNotification(){
|
||||
browser.ExecuteScriptAsync("TDGF_playSoundNotification()");
|
||||
}
|
||||
|
||||
public void ApplyROT13(){
|
||||
browser.ExecuteScriptAsync("TDGF_applyROT13()");
|
||||
}
|
||||
|
@@ -36,9 +36,15 @@ namespace TweetDuck.Core.Utils{
|
||||
}
|
||||
else if (shouldRun && AutoClearTimer == null){
|
||||
AutoClearTimer = new Timer(state => {
|
||||
if (AutoClearTimer != null && CalculateCacheSize() >= Program.SystemConfig.ClearCacheThreshold*1024L*1024L){
|
||||
if (AutoClearTimer != null){
|
||||
try{
|
||||
if (CalculateCacheSize() >= Program.SystemConfig.ClearCacheThreshold*1024L*1024L){
|
||||
SetClearOnExit();
|
||||
}
|
||||
}catch(Exception){
|
||||
// TODO should probably log errors and report them at some point
|
||||
}
|
||||
}
|
||||
}, null, TimeSpan.FromSeconds(30), TimeSpan.FromHours(4));
|
||||
}
|
||||
}
|
||||
|
@@ -10,19 +10,7 @@ using TweetDuck.Core.Other;
|
||||
|
||||
namespace TweetDuck.Core.Utils{
|
||||
static class BrowserUtils{
|
||||
public static string HeaderAcceptLanguage{
|
||||
get{
|
||||
string culture = Program.UserConfig.AppLocale;
|
||||
|
||||
if (culture == "en"){
|
||||
return "en-us,en";
|
||||
}
|
||||
else{
|
||||
return culture.ToLower()+",en;q=0.9";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static string HeaderAcceptLanguage => "en-us,en";
|
||||
public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
|
||||
|
||||
public static void SetupCefArgs(IDictionary<string, string> args){
|
||||
@@ -47,6 +35,10 @@ namespace TweetDuck.Core.Utils{
|
||||
return (ChromiumWebBrowser)browserControl;
|
||||
}
|
||||
|
||||
public static DefaultResourceHandlerFactory GetHandlerFactory(this ChromiumWebBrowser browser){
|
||||
return (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
|
||||
}
|
||||
|
||||
private const string TwitterTrackingUrl = "t.co";
|
||||
|
||||
public enum UrlCheckResult{
|
||||
|
@@ -1,17 +1,23 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
||||
namespace TweetDuck.Core.Utils{
|
||||
static class LocaleUtils{
|
||||
public static string LocaleFolder => Path.Combine(Program.ProgramPath, "locales");
|
||||
|
||||
public static IEnumerable<Item> ChromiumLocales => Directory
|
||||
.EnumerateFiles(LocaleFolder, "*.pak", SearchOption.TopDirectoryOnly)
|
||||
.Select(file => new Item(Path.GetFileNameWithoutExtension(file)))
|
||||
.OrderBy(code => code);
|
||||
// https://cs.chromium.org/chromium/src/third_party/hunspell_dictionaries/
|
||||
public static IEnumerable<Item> SpellCheckLanguages { get; } = new List<string>{
|
||||
"af-ZA", "bg-BG", "ca-ES", "cs-CZ", "da-DK", "de-DE",
|
||||
"el-GR", "en-AU", "en-CA", "en-GB", "en-US", "es-ES",
|
||||
"et-EE", "fa-IR", "fo-FO", "fr-FR", "he-IL", "hi-IN",
|
||||
"hr-HR", "hu-HU", "id-ID", "it-IT", "ko" , "lt-LT",
|
||||
"lv-LV", "nb-NO", "nl-NL", "pl-PL", "pt-BR", "pt-PT",
|
||||
"ro-RO", "ru-RU", "sk-SK", "sl-SI", "sq" , "sr",
|
||||
"sv-SE", "ta-IN", "tg-TG", "tr" , "uk-UA", "vi-VN"
|
||||
}.Select(code => {
|
||||
string lang = StringUtils.ExtractBefore(code, '-', 2);
|
||||
return lang == "en" || lang == "pt" ? new Item(code) : new Item(code, lang);
|
||||
}).OrderBy(code => code).ToList();
|
||||
|
||||
// TD.languages.getSupportedTranslationDestinationLanguages() except for "ht", "in", "iw" which are missing/duplicates
|
||||
public static IEnumerable<Item> TweetDeckTranslationLocales { get; } = new List<string>{
|
||||
@@ -26,9 +32,9 @@ namespace TweetDuck.Core.Utils{
|
||||
public string Code { get; }
|
||||
public CultureInfo Info { get; }
|
||||
|
||||
public Item(string code){
|
||||
public Item(string code, string alt = null){
|
||||
this.Code = code;
|
||||
this.Info = CultureInfo.GetCultureInfo(code);
|
||||
this.Info = CultureInfo.GetCultureInfo(alt ?? code);
|
||||
}
|
||||
|
||||
public override bool Equals(object obj){
|
||||
|
@@ -20,7 +20,7 @@ namespace TweetDuck{
|
||||
public const string BrandName = "TweetDuck";
|
||||
public const string Website = "https://tweetduck.chylex.com";
|
||||
|
||||
public const string VersionTag = "1.11.2";
|
||||
public const string VersionTag = "1.12.1.1";
|
||||
|
||||
public static readonly bool IsPortable = File.Exists("makeportable");
|
||||
|
||||
@@ -133,7 +133,6 @@ namespace TweetDuck{
|
||||
CefSettings settings = new CefSettings{
|
||||
AcceptLanguageList = BrowserUtils.HeaderAcceptLanguage,
|
||||
UserAgent = BrowserUtils.HeaderUserAgent,
|
||||
Locale = UserConfig.AppLocale,
|
||||
BrowserSubprocessPath = BrandName+".Browser.exe",
|
||||
CachePath = StoragePath,
|
||||
LogFile = ConsoleLogFilePath,
|
||||
|
@@ -8,7 +8,7 @@ Edit layout & design
|
||||
chylex
|
||||
|
||||
[version]
|
||||
1.1.8
|
||||
1.1.9
|
||||
|
||||
[website]
|
||||
https://tweetduck.chylex.com
|
||||
|
@@ -367,12 +367,12 @@ enabled(){
|
||||
this.css.insert(".app-content, .app-columns-container { background-color: #444448 !important }");
|
||||
this.css.insert(".column-drag-handle { opacity: 0.5 !important }");
|
||||
this.css.insert(".column-drag-handle:hover { opacity: 1 !important }");
|
||||
this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb { background-color: #666 !important }");
|
||||
this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover) { background-color: #666 !important }");
|
||||
notificationScrollbarColor = "666";
|
||||
break;
|
||||
|
||||
case "light":
|
||||
this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb { background-color: #d2d6da !important }");
|
||||
this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb:not(:hover) { background-color: #d2d6da !important }");
|
||||
this.css.insert(".app-columns-container.scroll-styled-h::-webkit-scrollbar-thumb:not(:hover) { background-color: #a5aeb5 !important }");
|
||||
notificationScrollbarColor = "a5aeb5";
|
||||
break;
|
||||
@@ -562,7 +562,7 @@ ${this.config.revertIcons ? `
|
||||
` : ``}
|
||||
|
||||
${notificationScrollbarColor ? `
|
||||
.scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb { background-color: #${notificationScrollbarColor} !important }
|
||||
.scroll-styled-v::-webkit-scrollbar-thumb:not(:hover), .scroll-styled-h::-webkit-scrollbar-thumb:not(:hover) { background-color: #${notificationScrollbarColor} !important }
|
||||
` : ``}
|
||||
</style>`);
|
||||
};
|
||||
|
@@ -233,7 +233,7 @@
|
||||
}
|
||||
|
||||
.td-avatar-shape-item-outer label {
|
||||
margin: 10px 0 0;
|
||||
margin: 10px 0 0 !important;
|
||||
}
|
||||
|
||||
.td-avatar-shape {
|
||||
|
@@ -9,7 +9,7 @@ Emoji keyboard
|
||||
chylex
|
||||
|
||||
[version]
|
||||
1.4.1
|
||||
1.4.2
|
||||
|
||||
[website]
|
||||
https://tweetduck.chylex.com
|
||||
|
@@ -349,7 +349,7 @@ enabled(){
|
||||
lastEmojiLength = foundEmoji.length;
|
||||
}
|
||||
}
|
||||
else if (foundNames.length > 1){
|
||||
else if (foundNames.length > 1 && $(".js-app-content").is(".is-open")){
|
||||
e.preventDefault();
|
||||
ele.val(val.substring(0, firstColon)+val.substring(ele[0].selectionStart));
|
||||
ele[0].selectionEnd = ele[0].selectionStart = firstColon;
|
||||
@@ -399,6 +399,7 @@ enabled(){
|
||||
ready(){
|
||||
this.composeDrawer = $("[data-drawer='compose']");
|
||||
this.composeInput = $(".js-compose-text", ".js-docked-compose");
|
||||
this.composeSelector = ".js-compose-text,.js-reply-tweetbox";
|
||||
|
||||
this.composePanelScroller = $(".js-compose-scroller", ".js-docked-compose").first().children().first();
|
||||
this.composePanelScroller.on("scroll", this.composerScrollEvent);
|
||||
@@ -407,11 +408,12 @@ ready(){
|
||||
$(document).on("click", this.documentClickEvent);
|
||||
$(document).on("keydown", this.documentKeyEvent);
|
||||
$(document).on("uiComposeImageAdded", this.uploadFilesEvent);
|
||||
this.composeInput.on("keydown", this.composeInputKeyDownEvent);
|
||||
this.composeInput.on("keypress", this.composeInputKeyPressEvent);
|
||||
this.composeInput.on("focus", this.composeInputFocusEvent);
|
||||
this.composeDrawer.on("uiComposeTweetSending", this.composerSendingEvent);
|
||||
|
||||
$(document).on("keydown", this.composeSelector, this.composeInputKeyDownEvent);
|
||||
$(document).on("keypress", this.composeSelector, this.composeInputKeyPressEvent);
|
||||
$(document).on("focus", this.composeSelector, this.composeInputFocusEvent);
|
||||
|
||||
// HTML generation
|
||||
|
||||
var convUnicode = function(codePt){
|
||||
@@ -533,10 +535,11 @@ disabled(){
|
||||
$(document).off("click", this.documentClickEvent);
|
||||
$(document).off("keydown", this.documentKeyEvent);
|
||||
$(document).off("uiComposeImageAdded", this.uploadFilesEvent);
|
||||
this.composeInput.off("keydown", this.composeInputKeyDownEvent);
|
||||
this.composeInput.off("keypress", this.composeInputKeyPressEvent);
|
||||
this.composeInput.off("focus", this.composeInputFocusEvent);
|
||||
this.composeDrawer.off("uiComposeTweetSending", this.composerSendingEvent);
|
||||
|
||||
$(document).off("keydown", this.composeSelector, this.composeInputKeyDownEvent);
|
||||
$(document).off("keypress", this.composeSelector, this.composeInputKeyPressEvent);
|
||||
$(document).off("focus", this.composeSelector, this.composeInputFocusEvent);
|
||||
|
||||
TD.mustaches["compose/docked_compose.mustache"] = this.prevComposeMustache;
|
||||
}
|
||||
|
@@ -182,6 +182,12 @@
|
||||
this.outerHTML = this.innerHTML;
|
||||
});
|
||||
|
||||
html.find("p.link-complex-target").filter(function(){
|
||||
return $(this).text() === "Show this thread";
|
||||
}).first().each(function(){
|
||||
this.id = "tduck-show-thread";
|
||||
});
|
||||
|
||||
let type = tweet.getChirpType();
|
||||
|
||||
if (type === "follow"){
|
||||
@@ -286,6 +292,7 @@
|
||||
tags.push(".tweet-context .nbfc { text-overflow: ellipsis !important; white-space: nowrap !important }"); // force ellipsis on long usernames
|
||||
tags.push(".activity-header { align-items: center !important; margin-bottom: 4px !important }"); // tweak alignment of avatar and text in notifications
|
||||
tags.push(".activity-header .tweet-timestamp { line-height: unset !important }"); // fix timestamp position in notifications
|
||||
tags.push("#tduck-show-thread { display: inline-block !important; cursor: pointer }");
|
||||
|
||||
if (fontSizeName === "smallest"){
|
||||
tags.push(".badge-verified:before { width: 13px !important; height: 13px !important; background-position: -223px -98px !important }"); // fix cut off badge icon
|
||||
@@ -388,7 +395,7 @@
|
||||
}
|
||||
else{
|
||||
tooltipTimer = window.setTimeout(function(){
|
||||
$TD.displayTooltip(me.attr("data-full-url"), false);
|
||||
$TD.displayTooltip(me.attr("data-full-url"));
|
||||
tooltipDisplayed = true;
|
||||
}, 400);
|
||||
}
|
||||
@@ -405,13 +412,13 @@
|
||||
|
||||
if (tooltipDisplayed){
|
||||
tooltipDisplayed = false;
|
||||
$TD.displayTooltip(null, false);
|
||||
$TD.displayTooltip(null);
|
||||
}
|
||||
},
|
||||
|
||||
mousemove: function(e){
|
||||
if (tooltipDisplayed && (prevMouseX !== e.clientX || prevMouseY !== e.clientY)){
|
||||
$TD.displayTooltip($(this).attr("data-full-url"), false);
|
||||
$TD.displayTooltip($(this).attr("data-full-url"));
|
||||
prevMouseX = e.clientX;
|
||||
prevMouseY = e.clientY;
|
||||
}
|
||||
@@ -500,10 +507,35 @@
|
||||
//
|
||||
// Block: Hook into the notification sound effect.
|
||||
//
|
||||
|
||||
HTMLAudioElement.prototype.play = prependToFunction(HTMLAudioElement.prototype.play, function(){
|
||||
return $TDX.muteNotifications || $TDX.hasCustomNotificationSound;
|
||||
return $TDX.muteNotifications;
|
||||
});
|
||||
|
||||
window.TDGF_setSoundNotificationData = function(custom, volume){
|
||||
let audio = document.getElementById("update-sound");
|
||||
audio.volume = volume/100;
|
||||
|
||||
const sourceId = "tduck-custom-sound-source";
|
||||
let source = document.getElementById(sourceId);
|
||||
|
||||
if (custom && !source){
|
||||
source = document.createElement("source");
|
||||
source.id = sourceId;
|
||||
source.src = "https://ton.twimg.com/tduck/updatesnd";
|
||||
audio.prepend(source);
|
||||
}
|
||||
else if (!custom && source){
|
||||
audio.removeChild(source);
|
||||
}
|
||||
|
||||
audio.load();
|
||||
};
|
||||
|
||||
window.TDGF_playSoundNotification = function(){
|
||||
document.getElementById("update-sound").play();
|
||||
};
|
||||
|
||||
//
|
||||
// Block: Update highlighted column and tweet for context menu and other functionality.
|
||||
//
|
||||
@@ -727,14 +759,12 @@
|
||||
// Block: Allow drag & drop behavior for dropping links on columns to open their detail view.
|
||||
//
|
||||
(function(){
|
||||
let tweetRegex = /^https?:\/\/twitter\.com\/[A-Za-z0-9_]+\/status\/(\d+)\/?$/;
|
||||
const tweetRegex = /^https?:\/\/twitter\.com\/[A-Za-z0-9_]+\/status\/(\d+)\/?$/;
|
||||
const selector = "section.js-column";
|
||||
|
||||
let isDraggingValid = false;
|
||||
|
||||
window.TDGF_onGlobalDragStart = function(type, data){
|
||||
isDraggingValid = (type === "link" || type === "text") && tweetRegex.test(data);
|
||||
};
|
||||
|
||||
app.delegate("section.js-column", {
|
||||
const events = {
|
||||
dragover: function(e){
|
||||
e.originalEvent.dataTransfer.dropEffect = isDraggingValid ? "move" : "none";
|
||||
e.preventDefault();
|
||||
@@ -760,7 +790,17 @@
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
window.TDGF_onGlobalDragStart = function(type, data){
|
||||
if (type === "link"){
|
||||
isDraggingValid = tweetRegex.test(data);
|
||||
app.delegate(selector, events);
|
||||
}
|
||||
else{
|
||||
app.undelegate(selector, events);
|
||||
}
|
||||
};
|
||||
})();
|
||||
|
||||
//
|
||||
@@ -1164,6 +1204,56 @@
|
||||
}));
|
||||
};
|
||||
|
||||
//
|
||||
// Block: Revert Like/Follow dialogs being closed after clicking an action.
|
||||
//
|
||||
(function(){
|
||||
const prevSetTimeout = window.setTimeout;
|
||||
|
||||
const overrideState = function(){
|
||||
return if !$TDX.keepLikeFollowDialogsOpen;
|
||||
|
||||
window.setTimeout = function(func, timeout){
|
||||
return timeout !== 500 && prevSetTimeout.apply(this, arguments);
|
||||
};
|
||||
};
|
||||
|
||||
const restoreState = function(context, key){
|
||||
window.setTimeout = prevSetTimeout;
|
||||
|
||||
if ($TDX.keepLikeFollowDialogsOpen && key in context.state){
|
||||
context.state[key] = false;
|
||||
}
|
||||
};
|
||||
|
||||
$(document).on("uiShowFavoriteFromOptions", function(){
|
||||
$(".js-btn-fav", ".js-modal-inner").each(function(){
|
||||
let event = $._data(this, "events").click[0];
|
||||
let handler = event.handler;
|
||||
|
||||
event.handler = function(){
|
||||
overrideState();
|
||||
handler.apply(this, arguments);
|
||||
restoreState($._data(document, "events").dataFavoriteState[0].handler.context, "stopSubsequentLikes");
|
||||
};
|
||||
});
|
||||
});
|
||||
|
||||
$(document).on("uiShowFollowFromOptions", function(){
|
||||
$(".js-component", ".js-modal-inner").each(function(){
|
||||
let event = $._data(this, "events").click[0];
|
||||
let handler = event.handler;
|
||||
let context = handler.context;
|
||||
|
||||
event.handler = function(){
|
||||
overrideState();
|
||||
handler.apply(this, arguments);
|
||||
restoreState(context, "stopSubsequentFollows");
|
||||
};
|
||||
});
|
||||
});
|
||||
})();
|
||||
|
||||
//
|
||||
// Block: Fix DM reply input box not getting focused after opening a conversation.
|
||||
//
|
||||
|
@@ -62,7 +62,7 @@
|
||||
}
|
||||
else{
|
||||
tooltipTimer = window.setTimeout(function(){
|
||||
$TD.displayTooltip(url, true);
|
||||
$TD.displayTooltip(url);
|
||||
tooltipDisplayed = true;
|
||||
}, 400);
|
||||
}
|
||||
@@ -83,7 +83,7 @@
|
||||
|
||||
if (tooltipDisplayed){
|
||||
tooltipDisplayed = false;
|
||||
$TD.displayTooltip(null, true);
|
||||
$TD.displayTooltip(null);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -92,13 +92,32 @@
|
||||
var url = e.currentTarget.getAttribute("data-full-url");
|
||||
return if !url;
|
||||
|
||||
$TD.displayTooltip(url, true);
|
||||
$TD.displayTooltip(url);
|
||||
prevMouseX = e.clientX;
|
||||
prevMouseY = e.clientY;
|
||||
}
|
||||
});
|
||||
})();
|
||||
|
||||
//
|
||||
// Block: Work around clipboard HTML formatting.
|
||||
//
|
||||
document.addEventListener("copy", function(e){
|
||||
window.setTimeout($TD.fixClipboard, 0);
|
||||
});
|
||||
|
||||
//
|
||||
// Block: Setup a handler for 'Show this thread'.
|
||||
//
|
||||
(function(){
|
||||
var btn = document.getElementById("tduck-show-thread");
|
||||
return if !btn;
|
||||
|
||||
btn.addEventListener("click", function(){
|
||||
$TD.showTweetDetail();
|
||||
});
|
||||
})();
|
||||
|
||||
//
|
||||
// Block: Setup a skip button.
|
||||
//
|
||||
|
@@ -378,10 +378,6 @@
|
||||
<Content Include="Resources\Scripts\update.js" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="lib\TweetLib.Audio\TweetLib.Audio.csproj">
|
||||
<Project>{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}</Project>
|
||||
<Name>TweetLib.Audio</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="subprocess\TweetDuck.Browser.csproj">
|
||||
<Project>{b10b0017-819e-4f71-870f-8256b36a26aa}</Project>
|
||||
<Name>TweetDuck.Browser</Name>
|
||||
@@ -403,19 +399,25 @@ ren "$(TargetDir)LICENSE.md" "LICENSE.txt"
|
||||
xcopy "$(ProjectDir)bld\Resources\CEFSHARP-LICENSE.txt" "$(TargetDir)" /Y
|
||||
xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcp120.dll" "$(TargetDir)" /Y
|
||||
xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcr120.dll" "$(TargetDir)" /Y
|
||||
|
||||
rmdir "$(TargetDir)scripts" /S /Q
|
||||
mkdir "$(TargetDir)scripts"
|
||||
xcopy "$(ProjectDir)Resources\Scripts\*" "$(TargetDir)scripts\" /E /Y
|
||||
|
||||
rmdir "$(TargetDir)plugins" /S /Q
|
||||
mkdir "$(TargetDir)plugins"
|
||||
mkdir "$(TargetDir)plugins\official"
|
||||
mkdir "$(TargetDir)plugins\user"
|
||||
xcopy "$(ProjectDir)Resources\Plugins\*" "$(TargetDir)plugins\official\" /E /Y
|
||||
rmdir "$(TargetDir)plugins\official\.debug" /S /Q
|
||||
del "$(TargetDir)plugins\official\emoji-keyboard\emoji-instructions.txt"
|
||||
|
||||
rmdir "$(ProjectDir)bin\Debug"
|
||||
rmdir "$(ProjectDir)bin\Release"
|
||||
|
||||
rmdir "$(TargetDir)plugins\official\.debug" /S /Q
|
||||
del "$(TargetDir)plugins\official\emoji-keyboard\emoji-instructions.txt"
|
||||
attrib +R "$(TargetDir)locales\en-US.pak"
|
||||
del /Q /A:-R "$(TargetDir)locales\*.pak"
|
||||
attrib -R "$(TargetDir)locales\en-US.pak"
|
||||
|
||||
if $(ConfigurationName) == Debug (
|
||||
rmdir "$(TargetDir)plugins\official\.debug" /S /Q
|
||||
|
@@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Browser", "subpro
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "tests\UnitTests.csproj", "{A958FA7A-4A2C-42A7-BFA0-159343483F4E}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetLib.Audio", "lib\TweetLib.Audio\TweetLib.Audio.csproj", "{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetDuck.Video", "video\TweetDuck.Video.csproj", "{278B2D11-402D-44B6-B6A1-8FA67DB65565}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TweetLib.Communication", "lib\TweetLib.Communication\TweetLib.Communication.csproj", "{72473763-4B9D-4FB6-A923-9364B2680F06}"
|
||||
@@ -32,10 +30,6 @@ Global
|
||||
{A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Debug|x86.Build.0 = Debug|x86
|
||||
{A958FA7A-4A2C-42A7-BFA0-159343483F4E}.Release|x86.ActiveCfg = Release|x86
|
||||
{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}.Debug|x86.Build.0 = Debug|x86
|
||||
{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}.Release|x86.ActiveCfg = Release|x86
|
||||
{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}.Release|x86.Build.0 = Release|x86
|
||||
{278B2D11-402D-44B6-B6A1-8FA67DB65565}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{278B2D11-402D-44B6-B6A1-8FA67DB65565}.Debug|x86.Build.0 = Debug|x86
|
||||
{278B2D11-402D-44B6-B6A1-8FA67DB65565}.Release|x86.ActiveCfg = Release|x86
|
||||
|
Binary file not shown.
@@ -59,7 +59,60 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
|
||||
Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
|
||||
|
||||
[InstallDelete]
|
||||
Type: files; Name: "{app}\TweetLib.Audio.dll"
|
||||
Type: filesandordirs; Name: "{app}\plugins\official"
|
||||
Type: files; Name: "{app}\locales\am.pak"
|
||||
Type: files; Name: "{app}\locales\ar.pak"
|
||||
Type: files; Name: "{app}\locales\bg.pak"
|
||||
Type: files; Name: "{app}\locales\bn.pak"
|
||||
Type: files; Name: "{app}\locales\ca.pak"
|
||||
Type: files; Name: "{app}\locales\cs.pak"
|
||||
Type: files; Name: "{app}\locales\da.pak"
|
||||
Type: files; Name: "{app}\locales\de.pak"
|
||||
Type: files; Name: "{app}\locales\el.pak"
|
||||
Type: files; Name: "{app}\locales\en-GB.pak"
|
||||
Type: files; Name: "{app}\locales\es-419.pak"
|
||||
Type: files; Name: "{app}\locales\es.pak"
|
||||
Type: files; Name: "{app}\locales\et.pak"
|
||||
Type: files; Name: "{app}\locales\fa.pak"
|
||||
Type: files; Name: "{app}\locales\fi.pak"
|
||||
Type: files; Name: "{app}\locales\fil.pak"
|
||||
Type: files; Name: "{app}\locales\fr.pak"
|
||||
Type: files; Name: "{app}\locales\gu.pak"
|
||||
Type: files; Name: "{app}\locales\he.pak"
|
||||
Type: files; Name: "{app}\locales\hi.pak"
|
||||
Type: files; Name: "{app}\locales\hr.pak"
|
||||
Type: files; Name: "{app}\locales\hu.pak"
|
||||
Type: files; Name: "{app}\locales\id.pak"
|
||||
Type: files; Name: "{app}\locales\it.pak"
|
||||
Type: files; Name: "{app}\locales\ja.pak"
|
||||
Type: files; Name: "{app}\locales\kn.pak"
|
||||
Type: files; Name: "{app}\locales\ko.pak"
|
||||
Type: files; Name: "{app}\locales\lt.pak"
|
||||
Type: files; Name: "{app}\locales\lv.pak"
|
||||
Type: files; Name: "{app}\locales\ml.pak"
|
||||
Type: files; Name: "{app}\locales\mr.pak"
|
||||
Type: files; Name: "{app}\locales\ms.pak"
|
||||
Type: files; Name: "{app}\locales\nb.pak"
|
||||
Type: files; Name: "{app}\locales\nl.pak"
|
||||
Type: files; Name: "{app}\locales\pl.pak"
|
||||
Type: files; Name: "{app}\locales\pt-BR.pak"
|
||||
Type: files; Name: "{app}\locales\pt-PT.pak"
|
||||
Type: files; Name: "{app}\locales\ro.pak"
|
||||
Type: files; Name: "{app}\locales\ru.pak"
|
||||
Type: files; Name: "{app}\locales\sk.pak"
|
||||
Type: files; Name: "{app}\locales\sl.pak"
|
||||
Type: files; Name: "{app}\locales\sr.pak"
|
||||
Type: files; Name: "{app}\locales\sv.pak"
|
||||
Type: files; Name: "{app}\locales\sw.pak"
|
||||
Type: files; Name: "{app}\locales\ta.pak"
|
||||
Type: files; Name: "{app}\locales\te.pak"
|
||||
Type: files; Name: "{app}\locales\th.pak"
|
||||
Type: files; Name: "{app}\locales\tr.pak"
|
||||
Type: files; Name: "{app}\locales\uk.pak"
|
||||
Type: files; Name: "{app}\locales\vi.pak"
|
||||
Type: files; Name: "{app}\locales\zh-CN.pak"
|
||||
Type: files; Name: "{app}\locales\zh-TW.pak"
|
||||
|
||||
[Code]
|
||||
function TDIsUninstallable: Boolean; forward;
|
||||
|
@@ -1,41 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using TweetLib.Audio.Impl;
|
||||
|
||||
namespace TweetLib.Audio{
|
||||
public abstract class AudioPlayer : IDisposable{
|
||||
private static bool? IsWMPAvailable;
|
||||
|
||||
public static AudioPlayer New(){
|
||||
if (IsWMPAvailable.HasValue){
|
||||
if (IsWMPAvailable.Value){
|
||||
return new SoundPlayerImplWMP();
|
||||
}
|
||||
else{
|
||||
return new SoundPlayerImplFallback();
|
||||
}
|
||||
}
|
||||
|
||||
try{
|
||||
SoundPlayerImplWMP implWMP = new SoundPlayerImplWMP();
|
||||
IsWMPAvailable = true;
|
||||
return implWMP;
|
||||
}catch(COMException){
|
||||
IsWMPAvailable = false;
|
||||
return new SoundPlayerImplFallback();
|
||||
}
|
||||
}
|
||||
|
||||
public abstract string SupportedFormats { get; }
|
||||
public abstract event EventHandler<PlaybackErrorEventArgs> PlaybackError;
|
||||
|
||||
public abstract void Play(string file);
|
||||
public abstract bool SetVolume(int volume);
|
||||
protected abstract void Dispose(bool disposing);
|
||||
|
||||
public void Dispose(){
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,53 +0,0 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Media;
|
||||
|
||||
namespace TweetLib.Audio.Impl{
|
||||
sealed class SoundPlayerImplFallback : AudioPlayer{
|
||||
public override string SupportedFormats => "*.wav";
|
||||
|
||||
public override event EventHandler<PlaybackErrorEventArgs> PlaybackError;
|
||||
|
||||
private readonly SoundPlayer player;
|
||||
private bool ignorePlaybackError;
|
||||
|
||||
public SoundPlayerImplFallback(){
|
||||
player = new SoundPlayer{
|
||||
LoadTimeout = 5000
|
||||
};
|
||||
}
|
||||
|
||||
public override void Play(string file){
|
||||
if (player.SoundLocation != file){
|
||||
player.SoundLocation = file;
|
||||
ignorePlaybackError = false;
|
||||
}
|
||||
|
||||
try{
|
||||
player.Play();
|
||||
}catch(FileNotFoundException e){
|
||||
OnNotificationSoundError("File not found: "+e.FileName);
|
||||
}catch(InvalidOperationException){
|
||||
OnNotificationSoundError("File format was not recognized.");
|
||||
}catch(TimeoutException){
|
||||
OnNotificationSoundError("File took too long to load.");
|
||||
}
|
||||
}
|
||||
|
||||
public override bool SetVolume(int volume){
|
||||
return false;
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing){
|
||||
player.Dispose();
|
||||
}
|
||||
|
||||
private void OnNotificationSoundError(string message){
|
||||
if (!ignorePlaybackError){
|
||||
PlaybackErrorEventArgs args = new PlaybackErrorEventArgs(message);
|
||||
PlaybackError?.Invoke(this, args);
|
||||
ignorePlaybackError = args.Ignore;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,124 +0,0 @@
|
||||
using System;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Windows.Forms;
|
||||
using WMPLib;
|
||||
|
||||
namespace TweetLib.Audio.Impl{
|
||||
sealed class SoundPlayerImplWMP : AudioPlayer{
|
||||
public override string SupportedFormats => "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au";
|
||||
|
||||
public override event EventHandler<PlaybackErrorEventArgs> PlaybackError;
|
||||
|
||||
private readonly Form owner;
|
||||
private readonly ControlWMP wmp;
|
||||
private bool wasTryingToPlay;
|
||||
private bool ignorePlaybackError;
|
||||
|
||||
private WindowsMediaPlayer Player => wmp.Ocx;
|
||||
|
||||
public SoundPlayerImplWMP(){
|
||||
owner = new Form();
|
||||
wmp = new ControlWMP();
|
||||
wmp.BeginInit();
|
||||
owner.Controls.Add(wmp);
|
||||
wmp.EndInit();
|
||||
|
||||
Player.uiMode = "none";
|
||||
Player.settings.autoStart = false;
|
||||
Player.settings.enableErrorDialogs = false;
|
||||
Player.settings.invokeURLs = false;
|
||||
Player.settings.volume = 0;
|
||||
Player.MediaChange += player_MediaChange;
|
||||
Player.MediaError += player_MediaError;
|
||||
}
|
||||
|
||||
public override void Play(string file){
|
||||
wasTryingToPlay = true;
|
||||
|
||||
try{
|
||||
if (Player.URL != file){
|
||||
Player.close();
|
||||
Player.URL = file;
|
||||
ignorePlaybackError = false;
|
||||
}
|
||||
else{
|
||||
Player.controls.stop();
|
||||
}
|
||||
|
||||
Player.controls.play();
|
||||
}catch(Exception e){
|
||||
OnNotificationSoundError("An error occurred in Windows Media Player: "+e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
public override bool SetVolume(int volume){
|
||||
Player.settings.volume = volume;
|
||||
return true;
|
||||
}
|
||||
|
||||
protected override void Dispose(bool disposing){
|
||||
wmp.Dispose();
|
||||
owner.Dispose();
|
||||
}
|
||||
|
||||
private void player_MediaChange(object item){
|
||||
IWMPMedia2 media = item as IWMPMedia2;
|
||||
|
||||
if (media == null){
|
||||
OnNotificationSoundError("Unknown error.");
|
||||
return;
|
||||
}
|
||||
// ReSharper disable once CompareOfFloatsByEqualityOperator
|
||||
else if (media.Error == null && media.duration == 0.0){
|
||||
OnNotificationSoundError("File does not contain an audio track.");
|
||||
}
|
||||
else if (media.Error != null){
|
||||
OnNotificationSoundError(media.Error);
|
||||
}
|
||||
|
||||
Marshal.ReleaseComObject(media);
|
||||
}
|
||||
|
||||
private void player_MediaError(object pMediaObject){
|
||||
IWMPMedia2 media = pMediaObject as IWMPMedia2;
|
||||
|
||||
if (media == null){
|
||||
OnNotificationSoundError("Unknown error.");
|
||||
return;
|
||||
}
|
||||
else if (media.Error != null){
|
||||
OnNotificationSoundError(media.Error);
|
||||
}
|
||||
|
||||
Marshal.ReleaseComObject(media);
|
||||
}
|
||||
|
||||
private void OnNotificationSoundError(IWMPErrorItem error){
|
||||
OnNotificationSoundError(error.errorCode == -1072885353 ? "Invalid media file." : error.errorDescription);
|
||||
Marshal.ReleaseComObject(error);
|
||||
}
|
||||
|
||||
private void OnNotificationSoundError(string message){
|
||||
if (wasTryingToPlay){
|
||||
wasTryingToPlay = false;
|
||||
|
||||
if (!ignorePlaybackError){
|
||||
PlaybackErrorEventArgs args = new PlaybackErrorEventArgs(message);
|
||||
PlaybackError?.Invoke(this, args);
|
||||
ignorePlaybackError = args.Ignore;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Clsid("{6bf52a52-394a-11d3-b153-00c04f79faa6}")]
|
||||
private sealed class ControlWMP : AxHost{
|
||||
public WindowsMediaPlayer Ocx { get; private set; }
|
||||
|
||||
public ControlWMP() : base("6bf52a52-394a-11d3-b153-00c04f79faa6"){}
|
||||
|
||||
protected override void AttachInterfaces(){
|
||||
Ocx = (WindowsMediaPlayer)GetOcx();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,13 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace TweetLib.Audio{
|
||||
public sealed class PlaybackErrorEventArgs : EventArgs{
|
||||
public string Message { get; }
|
||||
public bool Ignore { get; set; }
|
||||
|
||||
public PlaybackErrorEventArgs(string message){
|
||||
this.Message = message;
|
||||
this.Ignore = false;
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,35 +0,0 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about an assembly is controlled through the following
|
||||
// set of attributes. Change these attribute values to modify the information
|
||||
// associated with an assembly.
|
||||
[assembly: AssemblyTitle("TweetDuck Audio Library")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("TweetDuck Audio Library")]
|
||||
[assembly: AssemblyCopyright("")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// Setting ComVisible to false makes the types in this assembly not visible
|
||||
// to COM components. If you need to access a type in this assembly from
|
||||
// COM, set the ComVisible attribute to true on that type.
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("e9e1fd1b-f480-45b7-9970-be2ecfd309ac")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.1.1.0")]
|
||||
[assembly: AssemblyFileVersion("1.1.1.0")]
|
@@ -1,50 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProjectGuid>{E9E1FD1B-F480-45B7-9970-BE2ECFD309AC}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>TweetLib.Audio</RootNamespace>
|
||||
<AssemblyName>TweetLib.Audio</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ResolveComReferenceSilent>True</ResolveComReferenceSilent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<OutputPath>bin\x86\Debug\</OutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<OutputPath>bin\x86\Release\</OutputPath>
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AudioPlayer.cs" />
|
||||
<Compile Include="PlaybackErrorEventArgs.cs" />
|
||||
<Compile Include="Impl\SoundPlayerImplFallback.cs" />
|
||||
<Compile Include="Impl\SoundPlayerImplWMP.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<COMReference Include="WMPLib">
|
||||
<Guid>{6BF52A50-394A-11D3-B153-00C04F79FAA6}</Guid>
|
||||
<VersionMajor>1</VersionMajor>
|
||||
<VersionMinor>0</VersionMinor>
|
||||
<Lcid>0</Lcid>
|
||||
<WrapperTool>tlbimp</WrapperTool>
|
||||
<Isolated>False</Isolated>
|
||||
<EmbedInteropTypes>True</EmbedInteropTypes>
|
||||
</COMReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
Reference in New Issue
Block a user