mirror of
https://github.com/chylex/TweetDuck.git
synced 2025-09-14 10:32:10 +02:00
Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
e9b2fa7603 | |||
35afaa105d | |||
2e300a7b8f | |||
f3f5b88550 | |||
22f491d98a | |||
7908c8ebd9 | |||
e114a93714 | |||
931761600f | |||
e5b4b03e1a | |||
f1e8b3fbf0 | |||
4d64243a07 | |||
3422b4d4d6 | |||
b170d529fd | |||
83741db5aa | |||
c4b2b3ab25 | |||
676df44985 | |||
037adc6b5c | |||
186d17dd98 | |||
ab9ff980ef | |||
f297cb2623 | |||
b53c672768 | |||
1a2b967749 | |||
6ba30c48cf | |||
1af9ee9ced |
@@ -50,10 +50,14 @@ namespace TweetDuck.Configuration{
|
||||
public bool KeepLikeFollowDialogsOpen { get; set; } = true;
|
||||
public bool BestImageQuality { get; set; } = true;
|
||||
public bool EnableAnimatedImages { get; set; } = true;
|
||||
public int VideoPlayerVolume { get; set; } = 50;
|
||||
|
||||
public bool EnableSmoothScrolling { get; set; } = true;
|
||||
public string BrowserPath { get; set; } = null;
|
||||
private int _zoomLevel = 100;
|
||||
private bool _muteNotifications;
|
||||
|
||||
public int VideoPlayerVolume { get; set; } = 50;
|
||||
|
||||
public bool EnableSpellCheck { get; set; } = false;
|
||||
public string SpellCheckLanguage { get; set; } = "en-US";
|
||||
public string TranslationTarget { get; set; } = "en";
|
||||
@@ -174,6 +178,18 @@ namespace TweetDuck.Configuration{
|
||||
}
|
||||
}
|
||||
|
||||
public void Reset(){
|
||||
try{
|
||||
File.Delete(file);
|
||||
File.Delete(GetBackupFile(file));
|
||||
}catch(Exception e){
|
||||
Program.Reporter.HandleException("Configuration Error", "Could not delete configuration files to reset the options.", true, e);
|
||||
return;
|
||||
}
|
||||
|
||||
Reload();
|
||||
}
|
||||
|
||||
private void LoadInternal(bool backup){
|
||||
Serializer.Read(backup ? GetBackupFile(file) : file, this);
|
||||
|
||||
|
@@ -5,11 +5,11 @@ using TweetDuck.Configuration;
|
||||
using TweetDuck.Core.Bridge;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Handling;
|
||||
using TweetDuck.Core.Management;
|
||||
using TweetDuck.Core.Notification;
|
||||
using TweetDuck.Core.Notification.Screenshot;
|
||||
using TweetDuck.Core.Other;
|
||||
using TweetDuck.Core.Other.Analytics;
|
||||
using TweetDuck.Core.Other.Management;
|
||||
using TweetDuck.Core.Other.Settings;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Plugins;
|
||||
|
@@ -8,6 +8,7 @@ using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Utils;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using TweetDuck.Core.Management;
|
||||
using TweetDuck.Core.Other;
|
||||
|
||||
namespace TweetDuck.Core.Handling{
|
||||
|
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace TweetDuck.Core.Utils{
|
||||
namespace TweetDuck.Core.Management{
|
||||
static class BrowserCache{
|
||||
public static string CacheFolder => Path.Combine(Program.StoragePath, "Cache");
|
||||
|
@@ -2,38 +2,49 @@
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using TweetDuck.Core.Other;
|
||||
using TweetDuck.Data;
|
||||
using TweetDuck.Plugins;
|
||||
using TweetDuck.Plugins.Enums;
|
||||
|
||||
namespace TweetDuck.Core.Other.Settings.Export{
|
||||
sealed class ExportManager{
|
||||
namespace TweetDuck.Core.Management{
|
||||
sealed class ProfileManager{
|
||||
private static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies");
|
||||
private static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp");
|
||||
|
||||
[Flags]
|
||||
public enum Items{
|
||||
None = 0,
|
||||
UserConfig = 1,
|
||||
SystemConfig = 2, // TODO implement later
|
||||
Session = 4,
|
||||
PluginData = 8,
|
||||
All = UserConfig|SystemConfig|Session|PluginData
|
||||
}
|
||||
|
||||
public bool IsRestarting { get; private set; }
|
||||
public Exception LastException { get; private set; }
|
||||
|
||||
private readonly string file;
|
||||
private readonly PluginManager plugins;
|
||||
|
||||
public ExportManager(string file, PluginManager plugins){
|
||||
public ProfileManager(string file, PluginManager plugins){
|
||||
this.file = file;
|
||||
this.plugins = plugins;
|
||||
}
|
||||
|
||||
public bool Export(ExportFileFlags flags){
|
||||
public bool Export(Items items){
|
||||
try{
|
||||
using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
|
||||
if (flags.HasFlag(ExportFileFlags.UserConfig)){
|
||||
if (items.HasFlag(Items.UserConfig)){
|
||||
stream.WriteFile("config", Program.UserConfigFilePath);
|
||||
}
|
||||
|
||||
if (flags.HasFlag(ExportFileFlags.SystemConfig)){
|
||||
if (items.HasFlag(Items.SystemConfig)){
|
||||
stream.WriteFile("system", Program.SystemConfigFilePath);
|
||||
}
|
||||
|
||||
if (flags.HasFlag(ExportFileFlags.PluginData)){
|
||||
if (items.HasFlag(Items.PluginData)){
|
||||
stream.WriteFile("plugin.config", Program.PluginConfigFilePath);
|
||||
|
||||
foreach(Plugin plugin in plugins.Plugins){
|
||||
@@ -47,7 +58,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
|
||||
}
|
||||
}
|
||||
|
||||
if (flags.HasFlag(ExportFileFlags.Session)){
|
||||
if (items.HasFlag(Items.Session)){
|
||||
stream.WriteFile("cookies", CookiesPath);
|
||||
}
|
||||
|
||||
@@ -61,8 +72,8 @@ namespace TweetDuck.Core.Other.Settings.Export{
|
||||
}
|
||||
}
|
||||
|
||||
public ExportFileFlags GetImportFlags(){
|
||||
ExportFileFlags flags = ExportFileFlags.None;
|
||||
public Items FindImportItems(){
|
||||
Items items = Items.None;
|
||||
|
||||
try{
|
||||
using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None))){
|
||||
@@ -71,33 +82,33 @@ namespace TweetDuck.Core.Other.Settings.Export{
|
||||
while((key = stream.SkipFile()) != null){
|
||||
switch(key){
|
||||
case "config":
|
||||
flags |= ExportFileFlags.UserConfig;
|
||||
items |= Items.UserConfig;
|
||||
break;
|
||||
|
||||
case "system":
|
||||
flags |= ExportFileFlags.SystemConfig;
|
||||
items |= Items.SystemConfig;
|
||||
break;
|
||||
|
||||
case "plugin.config":
|
||||
case "plugin.data":
|
||||
flags |= ExportFileFlags.PluginData;
|
||||
items |= Items.PluginData;
|
||||
break;
|
||||
|
||||
case "cookies":
|
||||
flags |= ExportFileFlags.Session;
|
||||
items |= Items.Session;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}catch(Exception e){
|
||||
LastException = e;
|
||||
flags = ExportFileFlags.None;
|
||||
items = Items.None;
|
||||
}
|
||||
|
||||
return flags;
|
||||
return items;
|
||||
}
|
||||
|
||||
public bool Import(ExportFileFlags flags){
|
||||
public bool Import(Items items){
|
||||
try{
|
||||
HashSet<string> missingPlugins = new HashSet<string>();
|
||||
|
||||
@@ -107,14 +118,14 @@ namespace TweetDuck.Core.Other.Settings.Export{
|
||||
while((entry = stream.ReadFile()) != null){
|
||||
switch(entry.KeyName){
|
||||
case "config":
|
||||
if (flags.HasFlag(ExportFileFlags.UserConfig)){
|
||||
if (items.HasFlag(Items.UserConfig)){
|
||||
entry.WriteToFile(Program.UserConfigFilePath);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case "system":
|
||||
if (flags.HasFlag(ExportFileFlags.SystemConfig)){
|
||||
if (items.HasFlag(Items.SystemConfig)){
|
||||
entry.WriteToFile(Program.SystemConfigFilePath);
|
||||
IsRestarting = true;
|
||||
}
|
||||
@@ -122,14 +133,14 @@ namespace TweetDuck.Core.Other.Settings.Export{
|
||||
break;
|
||||
|
||||
case "plugin.config":
|
||||
if (flags.HasFlag(ExportFileFlags.PluginData)){
|
||||
if (items.HasFlag(Items.PluginData)){
|
||||
entry.WriteToFile(Program.PluginConfigFilePath);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case "plugin.data":
|
||||
if (flags.HasFlag(ExportFileFlags.PluginData)){
|
||||
if (items.HasFlag(Items.PluginData)){
|
||||
string[] value = entry.KeyValue;
|
||||
|
||||
entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
|
||||
@@ -142,7 +153,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
|
||||
break;
|
||||
|
||||
case "cookies":
|
||||
if (flags.HasFlag(ExportFileFlags.Session)){
|
||||
if (items.HasFlag(Items.Session)){
|
||||
entry.WriteToFile(Path.Combine(Program.StoragePath, TempCookiesPath));
|
||||
IsRestarting = true;
|
||||
}
|
@@ -3,10 +3,11 @@ using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Other;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetLib.Communication;
|
||||
|
||||
namespace TweetDuck.Core.Other.Management{
|
||||
namespace TweetDuck.Core.Management{
|
||||
sealed class VideoPlayer : IDisposable{
|
||||
public bool Running{
|
||||
get{
|
||||
@@ -56,10 +57,8 @@ namespace TweetDuck.Core.Other.Management{
|
||||
currentProcess.EnableRaisingEvents = true;
|
||||
currentProcess.Exited += process_Exited;
|
||||
|
||||
#if DEBUG
|
||||
currentProcess.BeginOutputReadLine();
|
||||
currentProcess.OutputDataReceived += (sender, args) => Debug.WriteLine("VideoPlayer: "+args.Data);
|
||||
#endif
|
||||
currentProcess.OutputDataReceived += process_OutputDataReceived;
|
||||
}
|
||||
|
||||
currentPipe.DisposeToken();
|
||||
@@ -146,6 +145,12 @@ namespace TweetDuck.Core.Other.Management{
|
||||
}
|
||||
}
|
||||
|
||||
private void process_OutputDataReceived(object sender, DataReceivedEventArgs e){
|
||||
if (!string.IsNullOrEmpty(e.Data)){
|
||||
Program.Reporter.Log("[VideoPlayer] "+e.Data);
|
||||
}
|
||||
}
|
||||
|
||||
private void process_Exited(object sender, EventArgs e){
|
||||
int exitCode = currentProcess.ExitCode;
|
||||
|
@@ -139,7 +139,7 @@ namespace TweetDuck.Core.Notification{
|
||||
|
||||
DpiScale = this.GetDPIScale();
|
||||
|
||||
browser.GetHandlerFactory().RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
|
||||
browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
|
||||
|
||||
Controls.Add(browser);
|
||||
|
||||
|
10
Core/Other/FormSettings.Designer.cs
generated
10
Core/Other/FormSettings.Designer.cs
generated
@@ -33,7 +33,7 @@
|
||||
//
|
||||
this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.btnClose.AutoSize = true;
|
||||
this.btnClose.Location = new System.Drawing.Point(449, 447);
|
||||
this.btnClose.Location = new System.Drawing.Point(449, 483);
|
||||
this.btnClose.Name = "btnClose";
|
||||
this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
|
||||
this.btnClose.Size = new System.Drawing.Size(49, 23);
|
||||
@@ -52,7 +52,7 @@
|
||||
this.panelContents.Location = new System.Drawing.Point(135, 12);
|
||||
this.panelContents.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||
this.panelContents.Name = "panelContents";
|
||||
this.panelContents.Size = new System.Drawing.Size(363, 429);
|
||||
this.panelContents.Size = new System.Drawing.Size(363, 465);
|
||||
this.panelContents.TabIndex = 1;
|
||||
//
|
||||
// panelButtons
|
||||
@@ -63,14 +63,14 @@
|
||||
this.panelButtons.Location = new System.Drawing.Point(12, 12);
|
||||
this.panelButtons.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
|
||||
this.panelButtons.Name = "panelButtons";
|
||||
this.panelButtons.Size = new System.Drawing.Size(124, 429);
|
||||
this.panelButtons.Size = new System.Drawing.Size(124, 465);
|
||||
this.panelButtons.TabIndex = 0;
|
||||
//
|
||||
// btnManageOptions
|
||||
//
|
||||
this.btnManageOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
this.btnManageOptions.AutoSize = true;
|
||||
this.btnManageOptions.Location = new System.Drawing.Point(12, 447);
|
||||
this.btnManageOptions.Location = new System.Drawing.Point(12, 483);
|
||||
this.btnManageOptions.Name = "btnManageOptions";
|
||||
this.btnManageOptions.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
|
||||
this.btnManageOptions.Size = new System.Drawing.Size(101, 23);
|
||||
@@ -83,7 +83,7 @@
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(510, 482);
|
||||
this.ClientSize = new System.Drawing.Size(510, 518);
|
||||
this.Controls.Add(this.btnManageOptions);
|
||||
this.Controls.Add(this.panelContents);
|
||||
this.Controls.Add(this.panelButtons);
|
||||
|
@@ -1,5 +1,4 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Configuration;
|
||||
|
||||
@@ -9,12 +8,21 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
|
||||
public IEnumerable<Control> InteractiveControls{
|
||||
get{
|
||||
foreach(Panel panel in Controls.OfType<Panel>()){
|
||||
foreach(Control control in panel.Controls){
|
||||
IEnumerable<Control> FindInteractiveControls(Control parent){
|
||||
foreach(Control control in parent.Controls){
|
||||
if (control is Panel subPanel){
|
||||
foreach(Control subControl in FindInteractiveControls(subPanel)){
|
||||
yield return subControl;
|
||||
}
|
||||
}
|
||||
else{
|
||||
yield return control;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return FindInteractiveControls(this);
|
||||
}
|
||||
}
|
||||
|
||||
protected BaseTabSettings(){
|
||||
|
@@ -2,7 +2,7 @@
|
||||
using System.IO;
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Configuration;
|
||||
using TweetDuck.Core.Other.Settings.Export;
|
||||
using TweetDuck.Core.Management;
|
||||
using TweetDuck.Plugins;
|
||||
|
||||
namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
@@ -11,24 +11,25 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
Deciding, Reset, Import, Export
|
||||
}
|
||||
|
||||
public ExportFileFlags Flags{
|
||||
get => selectedFlags;
|
||||
private ProfileManager.Items SelectedItems{
|
||||
get => _selectedItems;
|
||||
|
||||
set{
|
||||
// this will call events and SetFlag, which also updates the UI
|
||||
cbConfig.Checked = value.HasFlag(ExportFileFlags.UserConfig);
|
||||
cbSession.Checked = value.HasFlag(ExportFileFlags.Session);
|
||||
cbPluginData.Checked = value.HasFlag(ExportFileFlags.PluginData);
|
||||
cbConfig.Checked = value.HasFlag(ProfileManager.Items.UserConfig);
|
||||
cbSession.Checked = value.HasFlag(ProfileManager.Items.Session);
|
||||
cbPluginData.Checked = value.HasFlag(ProfileManager.Items.PluginData);
|
||||
}
|
||||
}
|
||||
|
||||
public bool ShouldReloadBrowser { get; private set; }
|
||||
|
||||
private readonly PluginManager plugins;
|
||||
private State currentState;
|
||||
|
||||
private ExportManager importManager;
|
||||
private ExportFileFlags selectedFlags = ExportFileFlags.None;
|
||||
private State currentState;
|
||||
private ProfileManager importManager;
|
||||
|
||||
private ProfileManager.Items _selectedItems = ProfileManager.Items.None;
|
||||
|
||||
public DialogSettingsManage(PluginManager plugins){
|
||||
InitializeComponent();
|
||||
@@ -42,15 +43,15 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
}
|
||||
|
||||
private void cbConfig_CheckedChanged(object sender, EventArgs e){
|
||||
SetFlag(ExportFileFlags.UserConfig, cbConfig.Checked);
|
||||
SetFlag(ProfileManager.Items.UserConfig, cbConfig.Checked);
|
||||
}
|
||||
|
||||
private void cbSession_CheckedChanged(object sender, EventArgs e){
|
||||
SetFlag(ExportFileFlags.Session, cbSession.Checked);
|
||||
SetFlag(ProfileManager.Items.Session, cbSession.Checked);
|
||||
}
|
||||
|
||||
private void cbPluginData_CheckedChanged(object sender, EventArgs e){
|
||||
SetFlag(ExportFileFlags.PluginData, cbPluginData.Checked);
|
||||
SetFlag(ProfileManager.Items.PluginData, cbPluginData.Checked);
|
||||
}
|
||||
|
||||
private void btnContinue_Click(object sender, EventArgs e){
|
||||
@@ -63,7 +64,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
currentState = State.Reset;
|
||||
|
||||
Text = "Restore Defaults";
|
||||
Flags = ExportFileFlags.UserConfig;
|
||||
SelectedItems = ProfileManager.Items.UserConfig;
|
||||
}
|
||||
|
||||
// Import
|
||||
@@ -81,11 +82,11 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
file = dialog.FileName;
|
||||
}
|
||||
|
||||
importManager = new ExportManager(file, plugins);
|
||||
importManager = new ProfileManager(file, plugins);
|
||||
currentState = State.Import;
|
||||
|
||||
Text = "Import Profile";
|
||||
Flags = importManager.GetImportFlags();
|
||||
SelectedItems = importManager.FindImportItems();
|
||||
|
||||
cbConfig.Enabled = cbConfig.Checked;
|
||||
cbSession.Enabled = cbSession.Checked;
|
||||
@@ -98,7 +99,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
|
||||
Text = "Export Profile";
|
||||
btnContinue.Text = "Export Profile";
|
||||
Flags = ExportFileFlags.All & ~ExportFileFlags.Session;
|
||||
SelectedItems = ProfileManager.Items.All & ~ProfileManager.Items.Session;
|
||||
}
|
||||
|
||||
// Continue...
|
||||
@@ -108,11 +109,11 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
|
||||
case State.Reset:
|
||||
if (FormMessage.Warning("Reset TweetDuck Options", "This will reset the selected items. Are you sure you want to proceed?", FormMessage.Yes, FormMessage.No)){
|
||||
if (Flags.HasFlag(ExportFileFlags.UserConfig)){
|
||||
Program.ResetConfig();
|
||||
if (SelectedItems.HasFlag(ProfileManager.Items.UserConfig)){
|
||||
Program.UserConfig.Reset();
|
||||
}
|
||||
|
||||
if (Flags.HasFlag(ExportFileFlags.SystemConfig)){
|
||||
if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
|
||||
try{
|
||||
File.Delete(Program.SystemConfigFilePath);
|
||||
}catch(Exception ex){
|
||||
@@ -120,7 +121,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
}
|
||||
}
|
||||
|
||||
if (Flags.HasFlag(ExportFileFlags.PluginData)){
|
||||
if (SelectedItems.HasFlag(ProfileManager.Items.PluginData)){
|
||||
try{
|
||||
File.Delete(Program.PluginConfigFilePath);
|
||||
Directory.Delete(Program.PluginDataPath, true);
|
||||
@@ -129,10 +130,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
}
|
||||
}
|
||||
|
||||
if (Flags.HasFlag(ExportFileFlags.Session)){
|
||||
if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
|
||||
Program.Restart(Arguments.ArgDeleteCookies);
|
||||
}
|
||||
else if (Flags.HasFlag(ExportFileFlags.SystemConfig)){
|
||||
else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
|
||||
Program.Restart();
|
||||
}
|
||||
else{
|
||||
@@ -146,14 +147,14 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
break;
|
||||
|
||||
case State.Import:
|
||||
if (importManager.Import(Flags)){
|
||||
if (importManager.Import(SelectedItems)){
|
||||
Program.UserConfig.Reload();
|
||||
|
||||
if (importManager.IsRestarting){
|
||||
if (Flags.HasFlag(ExportFileFlags.Session)){
|
||||
if (SelectedItems.HasFlag(ProfileManager.Items.Session)){
|
||||
Program.Restart(Arguments.ArgImportCookies);
|
||||
}
|
||||
else if (Flags.HasFlag(ExportFileFlags.SystemConfig)){
|
||||
else if (SelectedItems.HasFlag(ProfileManager.Items.SystemConfig)){
|
||||
Program.Restart();
|
||||
}
|
||||
}
|
||||
@@ -189,9 +190,9 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
Program.UserConfig.Save();
|
||||
Program.SystemConfig.Save();
|
||||
|
||||
ExportManager manager = new ExportManager(file, plugins);
|
||||
ProfileManager manager = new ProfileManager(file, plugins);
|
||||
|
||||
if (!manager.Export(Flags)){
|
||||
if (!manager.Export(SelectedItems)){
|
||||
Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting TweetDuck profile.", true, manager.LastException);
|
||||
}
|
||||
|
||||
@@ -206,15 +207,15 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
|
||||
Close();
|
||||
}
|
||||
|
||||
private void SetFlag(ExportFileFlags flag, bool enable){
|
||||
selectedFlags = enable ? selectedFlags | flag : selectedFlags & ~flag;
|
||||
btnContinue.Enabled = selectedFlags != ExportFileFlags.None;
|
||||
private void SetFlag(ProfileManager.Items flag, bool enable){
|
||||
_selectedItems = enable ? _selectedItems | flag : _selectedItems & ~flag;
|
||||
btnContinue.Enabled = _selectedItems != ProfileManager.Items.None;
|
||||
|
||||
if (currentState == State.Import){
|
||||
btnContinue.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Import && Restart" : "Import Profile";
|
||||
btnContinue.Text = _selectedItems.HasFlag(ProfileManager.Items.Session) ? "Import && Restart" : "Import Profile";
|
||||
}
|
||||
else if (currentState == State.Reset){
|
||||
btnContinue.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Restore && Restart" : "Restore Defaults";
|
||||
btnContinue.Text = _selectedItems.HasFlag(ProfileManager.Items.Session) ? "Restore && Restart" : "Restore Defaults";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,13 +0,0 @@
|
||||
using System;
|
||||
|
||||
namespace TweetDuck.Core.Other.Settings.Export{
|
||||
[Flags]
|
||||
enum ExportFileFlags{
|
||||
None = 0,
|
||||
UserConfig = 1,
|
||||
SystemConfig = 2, // TODO implement later
|
||||
Session = 4,
|
||||
PluginData = 8,
|
||||
All = UserConfig|SystemConfig|Session|PluginData
|
||||
}
|
||||
}
|
18
Core/Other/Settings/TabSettingsAdvanced.Designer.cs
generated
18
Core/Other/Settings/TabSettingsAdvanced.Designer.cs
generated
@@ -56,7 +56,7 @@
|
||||
this.btnClearCache.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.btnClearCache.Name = "btnClearCache";
|
||||
this.btnClearCache.Size = new System.Drawing.Size(144, 23);
|
||||
this.btnClearCache.TabIndex = 1;
|
||||
this.btnClearCache.TabIndex = 5;
|
||||
this.btnClearCache.Text = "Clear Cache (calculating)";
|
||||
this.btnClearCache.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -67,7 +67,7 @@
|
||||
this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
|
||||
this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
|
||||
this.checkHardwareAcceleration.TabIndex = 0;
|
||||
this.checkHardwareAcceleration.TabIndex = 3;
|
||||
this.checkHardwareAcceleration.Text = "Hardware Acceleration";
|
||||
this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -136,7 +136,7 @@
|
||||
this.numClearCacheThreshold.Minimum = 100;
|
||||
this.numClearCacheThreshold.Name = "numClearCacheThreshold";
|
||||
this.numClearCacheThreshold.Size = new System.Drawing.Size(72, 20);
|
||||
this.numClearCacheThreshold.TabIndex = 4;
|
||||
this.numClearCacheThreshold.TabIndex = 1;
|
||||
this.numClearCacheThreshold.TextSuffix = " MB";
|
||||
this.numClearCacheThreshold.Value = 250;
|
||||
//
|
||||
@@ -147,7 +147,7 @@
|
||||
this.checkClearCacheAuto.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkClearCacheAuto.Name = "checkClearCacheAuto";
|
||||
this.checkClearCacheAuto.Size = new System.Drawing.Size(215, 17);
|
||||
this.checkClearCacheAuto.TabIndex = 3;
|
||||
this.checkClearCacheAuto.TabIndex = 0;
|
||||
this.checkClearCacheAuto.Text = "Clear Cache Automatically When Above";
|
||||
this.checkClearCacheAuto.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -195,7 +195,7 @@
|
||||
this.panelClearCacheAuto.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelClearCacheAuto.Name = "panelClearCacheAuto";
|
||||
this.panelClearCacheAuto.Size = new System.Drawing.Size(322, 26);
|
||||
this.panelClearCacheAuto.TabIndex = 3;
|
||||
this.panelClearCacheAuto.TabIndex = 6;
|
||||
//
|
||||
// labelCache
|
||||
//
|
||||
@@ -204,7 +204,7 @@
|
||||
this.labelCache.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelCache.Name = "labelCache";
|
||||
this.labelCache.Size = new System.Drawing.Size(38, 13);
|
||||
this.labelCache.TabIndex = 2;
|
||||
this.labelCache.TabIndex = 4;
|
||||
this.labelCache.Text = "Cache";
|
||||
//
|
||||
// panelConfiguration
|
||||
@@ -216,7 +216,7 @@
|
||||
this.panelConfiguration.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelConfiguration.Name = "panelConfiguration";
|
||||
this.panelConfiguration.Size = new System.Drawing.Size(322, 29);
|
||||
this.panelConfiguration.TabIndex = 5;
|
||||
this.panelConfiguration.TabIndex = 8;
|
||||
//
|
||||
// labelConfiguration
|
||||
//
|
||||
@@ -226,7 +226,7 @@
|
||||
this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelConfiguration.Name = "labelConfiguration";
|
||||
this.labelConfiguration.Size = new System.Drawing.Size(104, 20);
|
||||
this.labelConfiguration.TabIndex = 4;
|
||||
this.labelConfiguration.TabIndex = 7;
|
||||
this.labelConfiguration.Text = "Configuration";
|
||||
//
|
||||
// flowPanel
|
||||
@@ -247,7 +247,7 @@
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 295);
|
||||
this.flowPanel.TabIndex = 6;
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// TabSettingsAdvanced
|
||||
|
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Configuration;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Management;
|
||||
using TweetDuck.Core.Other.Settings.Dialogs;
|
||||
using TweetDuck.Core.Utils;
|
||||
|
||||
|
13
Core/Other/Settings/TabSettingsFeedback.Designer.cs
generated
13
Core/Other/Settings/TabSettingsFeedback.Designer.cs
generated
@@ -47,7 +47,7 @@
|
||||
this.panelDataCollection.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelDataCollection.Name = "panelDataCollection";
|
||||
this.panelDataCollection.Size = new System.Drawing.Size(322, 26);
|
||||
this.panelDataCollection.TabIndex = 1;
|
||||
this.panelDataCollection.TabIndex = 3;
|
||||
//
|
||||
// labelDataCollectionLink
|
||||
//
|
||||
@@ -58,9 +58,10 @@
|
||||
this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.labelDataCollectionLink.Name = "labelDataCollectionLink";
|
||||
this.labelDataCollectionLink.Size = new System.Drawing.Size(66, 17);
|
||||
this.labelDataCollectionLink.TabIndex = 3;
|
||||
this.labelDataCollectionLink.TabIndex = 1;
|
||||
this.labelDataCollectionLink.TabStop = true;
|
||||
this.labelDataCollectionLink.Text = "(learn more)";
|
||||
this.labelDataCollectionLink.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
|
||||
this.labelDataCollectionLink.UseCompatibleTextRendering = true;
|
||||
//
|
||||
// checkDataCollection
|
||||
@@ -70,7 +71,7 @@
|
||||
this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 3);
|
||||
this.checkDataCollection.Name = "checkDataCollection";
|
||||
this.checkDataCollection.Size = new System.Drawing.Size(135, 17);
|
||||
this.checkDataCollection.TabIndex = 2;
|
||||
this.checkDataCollection.TabIndex = 0;
|
||||
this.checkDataCollection.Text = "Send Anonymous Data";
|
||||
this.checkDataCollection.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -101,7 +102,7 @@
|
||||
this.btnSendFeedback.Name = "btnSendFeedback";
|
||||
this.btnSendFeedback.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
|
||||
this.btnSendFeedback.Size = new System.Drawing.Size(164, 23);
|
||||
this.btnSendFeedback.TabIndex = 0;
|
||||
this.btnSendFeedback.TabIndex = 1;
|
||||
this.btnSendFeedback.Text = "Send Feedback / Bug Report";
|
||||
this.btnSendFeedback.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -112,7 +113,7 @@
|
||||
this.labelDataCollection.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelDataCollection.Name = "labelDataCollection";
|
||||
this.labelDataCollection.Size = new System.Drawing.Size(79, 13);
|
||||
this.labelDataCollection.TabIndex = 1;
|
||||
this.labelDataCollection.TabIndex = 2;
|
||||
this.labelDataCollection.Text = "Data Collection";
|
||||
//
|
||||
// labelFeedback
|
||||
@@ -141,7 +142,7 @@
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 209);
|
||||
this.flowPanel.TabIndex = 2;
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// TabSettingsFeedback
|
||||
|
96
Core/Other/Settings/TabSettingsGeneral.Designer.cs
generated
96
Core/Other/Settings/TabSettingsGeneral.Designer.cs
generated
@@ -41,6 +41,10 @@
|
||||
this.labelUpdates = new System.Windows.Forms.Label();
|
||||
this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.checkKeepLikeFollowDialogsOpen = new System.Windows.Forms.CheckBox();
|
||||
this.labelBrowserSettings = new System.Windows.Forms.Label();
|
||||
this.checkSmoothScrolling = new System.Windows.Forms.CheckBox();
|
||||
this.labelBrowserPath = new System.Windows.Forms.Label();
|
||||
this.comboBoxBrowserPath = new System.Windows.Forms.ComboBox();
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
|
||||
this.panelZoom.SuspendLayout();
|
||||
this.flowPanel.SuspendLayout();
|
||||
@@ -53,28 +57,28 @@
|
||||
this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkExpandLinks.Name = "checkExpandLinks";
|
||||
this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
|
||||
this.checkExpandLinks.TabIndex = 0;
|
||||
this.checkExpandLinks.TabIndex = 1;
|
||||
this.checkExpandLinks.Text = "Expand Links When Hovered";
|
||||
this.checkExpandLinks.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// checkUpdateNotifications
|
||||
//
|
||||
this.checkUpdateNotifications.AutoSize = true;
|
||||
this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 268);
|
||||
this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 386);
|
||||
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);
|
||||
this.checkUpdateNotifications.TabIndex = 0;
|
||||
this.checkUpdateNotifications.TabIndex = 14;
|
||||
this.checkUpdateNotifications.Text = "Check Updates Automatically";
|
||||
this.checkUpdateNotifications.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// btnCheckUpdates
|
||||
//
|
||||
this.btnCheckUpdates.Location = new System.Drawing.Point(5, 291);
|
||||
this.btnCheckUpdates.Location = new System.Drawing.Point(5, 409);
|
||||
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);
|
||||
this.btnCheckUpdates.TabIndex = 1;
|
||||
this.btnCheckUpdates.TabIndex = 15;
|
||||
this.btnCheckUpdates.Text = "Check Updates Now";
|
||||
this.btnCheckUpdates.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -85,7 +89,7 @@
|
||||
this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.labelZoomValue.Name = "labelZoomValue";
|
||||
this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
|
||||
this.labelZoomValue.TabIndex = 8;
|
||||
this.labelZoomValue.TabIndex = 1;
|
||||
this.labelZoomValue.Text = "100%";
|
||||
this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||
//
|
||||
@@ -96,7 +100,7 @@
|
||||
this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
|
||||
this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
|
||||
this.checkSwitchAccountSelectors.TabIndex = 1;
|
||||
this.checkSwitchAccountSelectors.TabIndex = 2;
|
||||
this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
|
||||
this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -107,7 +111,7 @@
|
||||
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);
|
||||
this.checkBestImageQuality.TabIndex = 3;
|
||||
this.checkBestImageQuality.TabIndex = 5;
|
||||
this.checkBestImageQuality.Text = "Best Image Quality";
|
||||
this.checkBestImageQuality.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -118,7 +122,7 @@
|
||||
this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
|
||||
this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
|
||||
this.checkOpenSearchInFirstColumn.TabIndex = 2;
|
||||
this.checkOpenSearchInFirstColumn.TabIndex = 3;
|
||||
this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
|
||||
this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -133,18 +137,18 @@
|
||||
this.trackBarZoom.Name = "trackBarZoom";
|
||||
this.trackBarZoom.Size = new System.Drawing.Size(148, 30);
|
||||
this.trackBarZoom.SmallChange = 5;
|
||||
this.trackBarZoom.TabIndex = 7;
|
||||
this.trackBarZoom.TabIndex = 0;
|
||||
this.trackBarZoom.TickFrequency = 25;
|
||||
this.trackBarZoom.Value = 100;
|
||||
//
|
||||
// labelZoom
|
||||
//
|
||||
this.labelZoom.AutoSize = true;
|
||||
this.labelZoom.Location = new System.Drawing.Point(3, 173);
|
||||
this.labelZoom.Location = new System.Drawing.Point(3, 291);
|
||||
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);
|
||||
this.labelZoom.TabIndex = 6;
|
||||
this.labelZoom.TabIndex = 11;
|
||||
this.labelZoom.Text = "Zoom";
|
||||
//
|
||||
// zoomUpdateTimer
|
||||
@@ -168,11 +172,11 @@
|
||||
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, 186);
|
||||
this.panelZoom.Location = new System.Drawing.Point(0, 304);
|
||||
this.panelZoom.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelZoom.Name = "panelZoom";
|
||||
this.panelZoom.Size = new System.Drawing.Size(322, 36);
|
||||
this.panelZoom.TabIndex = 1;
|
||||
this.panelZoom.TabIndex = 12;
|
||||
//
|
||||
// checkAnimatedAvatars
|
||||
//
|
||||
@@ -181,7 +185,7 @@
|
||||
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);
|
||||
this.checkAnimatedAvatars.TabIndex = 4;
|
||||
this.checkAnimatedAvatars.TabIndex = 6;
|
||||
this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
|
||||
this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -189,11 +193,11 @@
|
||||
//
|
||||
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, 242);
|
||||
this.labelUpdates.Location = new System.Drawing.Point(0, 360);
|
||||
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);
|
||||
this.labelUpdates.TabIndex = 2;
|
||||
this.labelUpdates.TabIndex = 13;
|
||||
this.labelUpdates.Text = "Updates";
|
||||
//
|
||||
// flowPanel
|
||||
@@ -208,6 +212,10 @@
|
||||
this.flowPanel.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
|
||||
this.flowPanel.Controls.Add(this.checkBestImageQuality);
|
||||
this.flowPanel.Controls.Add(this.checkAnimatedAvatars);
|
||||
this.flowPanel.Controls.Add(this.labelBrowserSettings);
|
||||
this.flowPanel.Controls.Add(this.checkSmoothScrolling);
|
||||
this.flowPanel.Controls.Add(this.labelBrowserPath);
|
||||
this.flowPanel.Controls.Add(this.comboBoxBrowserPath);
|
||||
this.flowPanel.Controls.Add(this.labelZoom);
|
||||
this.flowPanel.Controls.Add(this.panelZoom);
|
||||
this.flowPanel.Controls.Add(this.labelUpdates);
|
||||
@@ -216,8 +224,8 @@
|
||||
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, 319);
|
||||
this.flowPanel.TabIndex = 4;
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 438);
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// checkKeepLikeFollowDialogsOpen
|
||||
@@ -227,17 +235,59 @@
|
||||
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.TabIndex = 4;
|
||||
this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
|
||||
this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// labelBrowserSettings
|
||||
//
|
||||
this.labelBrowserSettings.AutoSize = true;
|
||||
this.labelBrowserSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
|
||||
this.labelBrowserSettings.Location = new System.Drawing.Point(0, 181);
|
||||
this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelBrowserSettings.Name = "labelBrowserSettings";
|
||||
this.labelBrowserSettings.Size = new System.Drawing.Size(130, 20);
|
||||
this.labelBrowserSettings.TabIndex = 7;
|
||||
this.labelBrowserSettings.Text = "Browser Settings";
|
||||
//
|
||||
// checkSmoothScrolling
|
||||
//
|
||||
this.checkSmoothScrolling.AutoSize = true;
|
||||
this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 207);
|
||||
this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkSmoothScrolling.Name = "checkSmoothScrolling";
|
||||
this.checkSmoothScrolling.Size = new System.Drawing.Size(105, 17);
|
||||
this.checkSmoothScrolling.TabIndex = 8;
|
||||
this.checkSmoothScrolling.Text = "Smooth Scrolling";
|
||||
this.checkSmoothScrolling.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// labelBrowserPath
|
||||
//
|
||||
this.labelBrowserPath.AutoSize = true;
|
||||
this.labelBrowserPath.Location = new System.Drawing.Point(3, 239);
|
||||
this.labelBrowserPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelBrowserPath.Name = "labelBrowserPath";
|
||||
this.labelBrowserPath.Size = new System.Drawing.Size(95, 13);
|
||||
this.labelBrowserPath.TabIndex = 9;
|
||||
this.labelBrowserPath.Text = "Open Links With...";
|
||||
//
|
||||
// comboBoxBrowserPath
|
||||
//
|
||||
this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.comboBoxBrowserPath.FormattingEnabled = true;
|
||||
this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 255);
|
||||
this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
|
||||
this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 21);
|
||||
this.comboBoxBrowserPath.TabIndex = 10;
|
||||
//
|
||||
// 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, 337);
|
||||
this.Size = new System.Drawing.Size(340, 456);
|
||||
((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
|
||||
this.panelZoom.ResumeLayout(false);
|
||||
this.flowPanel.ResumeLayout(false);
|
||||
@@ -265,5 +315,9 @@
|
||||
private System.Windows.Forms.CheckBox checkAnimatedAvatars;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowPanel;
|
||||
private System.Windows.Forms.CheckBox checkKeepLikeFollowDialogsOpen;
|
||||
private System.Windows.Forms.Label labelBrowserPath;
|
||||
private System.Windows.Forms.ComboBox comboBoxBrowserPath;
|
||||
private System.Windows.Forms.Label labelBrowserSettings;
|
||||
private System.Windows.Forms.CheckBox checkSmoothScrolling;
|
||||
}
|
||||
}
|
||||
|
@@ -1,6 +1,10 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using TweetDuck.Core.Controls;
|
||||
using TweetDuck.Core.Handling.General;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Updates;
|
||||
|
||||
namespace TweetDuck.Core.Other.Settings{
|
||||
@@ -9,6 +13,9 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
private readonly UpdateHandler updates;
|
||||
private int updateCheckEventId = -1;
|
||||
|
||||
private readonly int browserListIndexDefault;
|
||||
private readonly int browserListIndexCustom;
|
||||
|
||||
public TabSettingsGeneral(FormBrowser browser, UpdateHandler updates){
|
||||
InitializeComponent();
|
||||
|
||||
@@ -25,15 +32,14 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
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.");
|
||||
|
||||
toolTip.SetToolTip(checkSmoothScrolling, "Toggles smooth mouse wheel scrolling.");
|
||||
toolTip.SetToolTip(comboBoxBrowserPath, "Sets the default browser for opening links.");
|
||||
toolTip.SetToolTip(labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
|
||||
toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
|
||||
|
||||
toolTip.SetToolTip(checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
|
||||
toolTip.SetToolTip(btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
|
||||
|
||||
trackBarZoom.SetValueSafe(Config.ZoomLevel);
|
||||
labelZoomValue.Text = trackBarZoom.Value+"%";
|
||||
|
||||
checkExpandLinks.Checked = Config.ExpandLinksOnHover;
|
||||
checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
|
||||
checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
|
||||
@@ -41,6 +47,19 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
checkBestImageQuality.Checked = Config.BestImageQuality;
|
||||
checkAnimatedAvatars.Checked = Config.EnableAnimatedImages;
|
||||
|
||||
checkSmoothScrolling.Checked = Config.EnableSmoothScrolling;
|
||||
|
||||
foreach(WindowsUtils.Browser browserInfo in WindowsUtils.FindInstalledBrowsers()){
|
||||
comboBoxBrowserPath.Items.Add(browserInfo);
|
||||
}
|
||||
|
||||
browserListIndexDefault = comboBoxBrowserPath.Items.Add("(default browser)");
|
||||
browserListIndexCustom = comboBoxBrowserPath.Items.Add("(custom program...)");
|
||||
UpdateBrowserPathSelection();
|
||||
|
||||
trackBarZoom.SetValueSafe(Config.ZoomLevel);
|
||||
labelZoomValue.Text = trackBarZoom.Value+"%";
|
||||
|
||||
checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
|
||||
}
|
||||
|
||||
@@ -51,6 +70,9 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
|
||||
checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
|
||||
checkAnimatedAvatars.CheckedChanged += checkAnimatedAvatars_CheckedChanged;
|
||||
|
||||
checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
|
||||
comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
|
||||
trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
|
||||
|
||||
checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
|
||||
@@ -86,6 +108,51 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
BrowserProcessHandler.UpdatePrefs().ContinueWith(task => browser.ReloadColumns());
|
||||
}
|
||||
|
||||
private void checkSmoothScrolling_CheckedChanged(object sender, EventArgs e){
|
||||
Config.EnableSmoothScrolling = checkSmoothScrolling.Checked;
|
||||
PromptRestart();
|
||||
}
|
||||
|
||||
private void UpdateBrowserPathSelection(){
|
||||
if (string.IsNullOrEmpty(Config.BrowserPath) || !File.Exists(Config.BrowserPath)){
|
||||
comboBoxBrowserPath.SelectedIndex = browserListIndexDefault;
|
||||
}
|
||||
else{
|
||||
WindowsUtils.Browser browserInfo = comboBoxBrowserPath.Items.OfType<WindowsUtils.Browser>().FirstOrDefault(browser => browser.Path == Config.BrowserPath);
|
||||
|
||||
if (browserInfo == null){
|
||||
comboBoxBrowserPath.SelectedIndex = browserListIndexCustom;
|
||||
}
|
||||
else{
|
||||
comboBoxBrowserPath.SelectedItem = browserInfo;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void comboBoxBrowserPath_SelectedIndexChanged(object sender, EventArgs e){
|
||||
if (comboBoxBrowserPath.SelectedIndex == browserListIndexCustom){
|
||||
using(OpenFileDialog dialog = new OpenFileDialog{
|
||||
AutoUpgradeEnabled = true,
|
||||
DereferenceLinks = true,
|
||||
InitialDirectory = Path.GetDirectoryName(Config.BrowserPath), // returns null if argument is null
|
||||
Title = "Open Links With...",
|
||||
Filter = "Executables (*.exe;*.bat;*.cmd)|*.exe;*.bat;*.cmd|All Files (*.*)|*.*"
|
||||
}){
|
||||
if (dialog.ShowDialog() == DialogResult.OK){
|
||||
Config.BrowserPath = dialog.FileName;
|
||||
}
|
||||
else{
|
||||
comboBoxBrowserPath.SelectedIndexChanged -= comboBoxBrowserPath_SelectedIndexChanged;
|
||||
UpdateBrowserPathSelection();
|
||||
comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
Config.BrowserPath = (comboBoxBrowserPath.SelectedItem as WindowsUtils.Browser)?.Path; // default browser item is a string and casts to null
|
||||
}
|
||||
}
|
||||
|
||||
private void trackBarZoom_ValueChanged(object sender, EventArgs e){
|
||||
if (trackBarZoom.AlignValueToTick()){
|
||||
zoomUpdateTimer.Stop();
|
||||
|
14
Core/Other/Settings/TabSettingsLocales.Designer.cs
generated
14
Core/Other/Settings/TabSettingsLocales.Designer.cs
generated
@@ -43,7 +43,7 @@
|
||||
this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkSpellCheck.Name = "checkSpellCheck";
|
||||
this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
|
||||
this.checkSpellCheck.TabIndex = 5;
|
||||
this.checkSpellCheck.TabIndex = 1;
|
||||
this.checkSpellCheck.Text = "Enable Spell Check";
|
||||
this.checkSpellCheck.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -74,7 +74,7 @@
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 193);
|
||||
this.flowPanel.TabIndex = 4;
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// labelSpellCheckLanguage
|
||||
@@ -84,7 +84,7 @@
|
||||
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.TabIndex = 2;
|
||||
this.labelSpellCheckLanguage.Text = "Spell Check Language";
|
||||
//
|
||||
// comboBoxSpellCheckLanguage
|
||||
@@ -95,7 +95,7 @@
|
||||
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;
|
||||
this.comboBoxSpellCheckLanguage.TabIndex = 3;
|
||||
//
|
||||
// labelTranslations
|
||||
//
|
||||
@@ -105,7 +105,7 @@
|
||||
this.labelTranslations.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelTranslations.Name = "labelTranslations";
|
||||
this.labelTranslations.Size = new System.Drawing.Size(116, 20);
|
||||
this.labelTranslations.TabIndex = 10;
|
||||
this.labelTranslations.TabIndex = 4;
|
||||
this.labelTranslations.Text = "Bing Translator";
|
||||
//
|
||||
// labelTranslationTarget
|
||||
@@ -115,7 +115,7 @@
|
||||
this.labelTranslationTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelTranslationTarget.Name = "labelTranslationTarget";
|
||||
this.labelTranslationTarget.Size = new System.Drawing.Size(89, 13);
|
||||
this.labelTranslationTarget.TabIndex = 8;
|
||||
this.labelTranslationTarget.TabIndex = 5;
|
||||
this.labelTranslationTarget.Text = "Target Language";
|
||||
//
|
||||
// comboBoxTranslationTarget
|
||||
@@ -126,7 +126,7 @@
|
||||
this.comboBoxTranslationTarget.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.comboBoxTranslationTarget.Name = "comboBoxTranslationTarget";
|
||||
this.comboBoxTranslationTarget.Size = new System.Drawing.Size(311, 21);
|
||||
this.comboBoxTranslationTarget.TabIndex = 7;
|
||||
this.comboBoxTranslationTarget.TabIndex = 6;
|
||||
//
|
||||
// TabSettingsLocales
|
||||
//
|
||||
|
@@ -84,7 +84,7 @@
|
||||
this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
|
||||
this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 13);
|
||||
this.labelEdgeDistanceValue.TabIndex = 9;
|
||||
this.labelEdgeDistanceValue.TabIndex = 1;
|
||||
this.labelEdgeDistanceValue.Text = "0 px";
|
||||
this.labelEdgeDistanceValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||
//
|
||||
@@ -95,7 +95,7 @@
|
||||
this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelDisplay.Name = "labelDisplay";
|
||||
this.labelDisplay.Size = new System.Drawing.Size(41, 13);
|
||||
this.labelDisplay.TabIndex = 5;
|
||||
this.labelDisplay.TabIndex = 15;
|
||||
this.labelDisplay.Text = "Display";
|
||||
//
|
||||
// comboBoxDisplay
|
||||
@@ -106,7 +106,7 @@
|
||||
this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.comboBoxDisplay.Name = "comboBoxDisplay";
|
||||
this.comboBoxDisplay.Size = new System.Drawing.Size(144, 21);
|
||||
this.comboBoxDisplay.TabIndex = 6;
|
||||
this.comboBoxDisplay.TabIndex = 16;
|
||||
//
|
||||
// labelEdgeDistance
|
||||
//
|
||||
@@ -115,7 +115,7 @@
|
||||
this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelEdgeDistance.Name = "labelEdgeDistance";
|
||||
this.labelEdgeDistance.Size = new System.Drawing.Size(103, 13);
|
||||
this.labelEdgeDistance.TabIndex = 7;
|
||||
this.labelEdgeDistance.TabIndex = 17;
|
||||
this.labelEdgeDistance.Text = "Distance From Edge";
|
||||
//
|
||||
// radioLocCustom
|
||||
@@ -183,7 +183,7 @@
|
||||
this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
|
||||
this.trackBarEdgeDistance.Size = new System.Drawing.Size(148, 30);
|
||||
this.trackBarEdgeDistance.SmallChange = 2;
|
||||
this.trackBarEdgeDistance.TabIndex = 8;
|
||||
this.trackBarEdgeDistance.TabIndex = 0;
|
||||
this.trackBarEdgeDistance.TickFrequency = 4;
|
||||
this.trackBarEdgeDistance.Value = 8;
|
||||
//
|
||||
@@ -201,7 +201,7 @@
|
||||
this.tableLayoutDurationButtons.RowCount = 1;
|
||||
this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
|
||||
this.tableLayoutDurationButtons.Size = new System.Drawing.Size(171, 27);
|
||||
this.tableLayoutDurationButtons.TabIndex = 5;
|
||||
this.tableLayoutDurationButtons.TabIndex = 12;
|
||||
//
|
||||
// btnDurationMedium
|
||||
//
|
||||
@@ -255,7 +255,7 @@
|
||||
this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.labelDurationValue.Name = "labelDurationValue";
|
||||
this.labelDurationValue.Size = new System.Drawing.Size(52, 13);
|
||||
this.labelDurationValue.TabIndex = 4;
|
||||
this.labelDurationValue.TabIndex = 1;
|
||||
this.labelDurationValue.Text = "0 ms/c";
|
||||
this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||
//
|
||||
@@ -267,7 +267,7 @@
|
||||
this.trackBarDuration.Minimum = 10;
|
||||
this.trackBarDuration.Name = "trackBarDuration";
|
||||
this.trackBarDuration.Size = new System.Drawing.Size(148, 30);
|
||||
this.trackBarDuration.TabIndex = 3;
|
||||
this.trackBarDuration.TabIndex = 0;
|
||||
this.trackBarDuration.TickFrequency = 5;
|
||||
this.trackBarDuration.Value = 25;
|
||||
//
|
||||
@@ -278,7 +278,7 @@
|
||||
this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
|
||||
this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
|
||||
this.checkSkipOnLinkClick.TabIndex = 2;
|
||||
this.checkSkipOnLinkClick.TabIndex = 3;
|
||||
this.checkSkipOnLinkClick.Text = "Skip On Link Click";
|
||||
this.checkSkipOnLinkClick.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -289,7 +289,7 @@
|
||||
this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkColumnName.Name = "checkColumnName";
|
||||
this.checkColumnName.Size = new System.Drawing.Size(129, 17);
|
||||
this.checkColumnName.TabIndex = 0;
|
||||
this.checkColumnName.TabIndex = 1;
|
||||
this.checkColumnName.Text = "Display Column Name";
|
||||
this.checkColumnName.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -300,7 +300,7 @@
|
||||
this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelIdlePause.Name = "labelIdlePause";
|
||||
this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
|
||||
this.labelIdlePause.TabIndex = 4;
|
||||
this.labelIdlePause.TabIndex = 5;
|
||||
this.labelIdlePause.Text = "Pause When Idle";
|
||||
//
|
||||
// comboBoxIdlePause
|
||||
@@ -311,7 +311,7 @@
|
||||
this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
|
||||
this.comboBoxIdlePause.Name = "comboBoxIdlePause";
|
||||
this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 21);
|
||||
this.comboBoxIdlePause.TabIndex = 5;
|
||||
this.comboBoxIdlePause.TabIndex = 6;
|
||||
//
|
||||
// checkNonIntrusive
|
||||
//
|
||||
@@ -320,7 +320,7 @@
|
||||
this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkNonIntrusive.Name = "checkNonIntrusive";
|
||||
this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
|
||||
this.checkNonIntrusive.TabIndex = 3;
|
||||
this.checkNonIntrusive.TabIndex = 4;
|
||||
this.checkNonIntrusive.Text = "Non-Intrusive Popups";
|
||||
this.checkNonIntrusive.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -331,7 +331,7 @@
|
||||
this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkTimerCountDown.Name = "checkTimerCountDown";
|
||||
this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
|
||||
this.checkTimerCountDown.TabIndex = 1;
|
||||
this.checkTimerCountDown.TabIndex = 9;
|
||||
this.checkTimerCountDown.Text = "Timer Counts Down";
|
||||
this.checkTimerCountDown.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -342,7 +342,7 @@
|
||||
this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkNotificationTimer.Name = "checkNotificationTimer";
|
||||
this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
|
||||
this.checkNotificationTimer.TabIndex = 0;
|
||||
this.checkNotificationTimer.TabIndex = 8;
|
||||
this.checkNotificationTimer.Text = "Display Notification Timer";
|
||||
this.checkNotificationTimer.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -388,7 +388,7 @@
|
||||
this.panelEdgeDistance.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelEdgeDistance.Name = "panelEdgeDistance";
|
||||
this.panelEdgeDistance.Size = new System.Drawing.Size(322, 36);
|
||||
this.panelEdgeDistance.TabIndex = 1;
|
||||
this.panelEdgeDistance.TabIndex = 18;
|
||||
//
|
||||
// checkMediaPreviews
|
||||
//
|
||||
@@ -397,7 +397,7 @@
|
||||
this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
|
||||
this.checkMediaPreviews.Name = "checkMediaPreviews";
|
||||
this.checkMediaPreviews.Size = new System.Drawing.Size(131, 17);
|
||||
this.checkMediaPreviews.TabIndex = 1;
|
||||
this.checkMediaPreviews.TabIndex = 2;
|
||||
this.checkMediaPreviews.Text = "Show Media Previews";
|
||||
this.checkMediaPreviews.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -407,7 +407,7 @@
|
||||
this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
|
||||
this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 13);
|
||||
this.labelScrollSpeedValue.TabIndex = 4;
|
||||
this.labelScrollSpeedValue.TabIndex = 1;
|
||||
this.labelScrollSpeedValue.Text = "100%";
|
||||
this.labelScrollSpeedValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||
//
|
||||
@@ -421,7 +421,7 @@
|
||||
this.trackBarScrollSpeed.Name = "trackBarScrollSpeed";
|
||||
this.trackBarScrollSpeed.Size = new System.Drawing.Size(148, 30);
|
||||
this.trackBarScrollSpeed.SmallChange = 5;
|
||||
this.trackBarScrollSpeed.TabIndex = 3;
|
||||
this.trackBarScrollSpeed.TabIndex = 0;
|
||||
this.trackBarScrollSpeed.TickFrequency = 25;
|
||||
this.trackBarScrollSpeed.Value = 100;
|
||||
//
|
||||
@@ -432,7 +432,7 @@
|
||||
this.labelScrollSpeed.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelScrollSpeed.Name = "labelScrollSpeed";
|
||||
this.labelScrollSpeed.Size = new System.Drawing.Size(67, 13);
|
||||
this.labelScrollSpeed.TabIndex = 2;
|
||||
this.labelScrollSpeed.TabIndex = 21;
|
||||
this.labelScrollSpeed.Text = "Scroll Speed";
|
||||
//
|
||||
// labelLocation
|
||||
@@ -443,7 +443,7 @@
|
||||
this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelLocation.Name = "labelLocation";
|
||||
this.labelLocation.Size = new System.Drawing.Size(70, 20);
|
||||
this.labelLocation.TabIndex = 4;
|
||||
this.labelLocation.TabIndex = 13;
|
||||
this.labelLocation.Text = "Location";
|
||||
//
|
||||
// panelLocation
|
||||
@@ -458,7 +458,7 @@
|
||||
this.panelLocation.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelLocation.Name = "panelLocation";
|
||||
this.panelLocation.Size = new System.Drawing.Size(322, 49);
|
||||
this.panelLocation.TabIndex = 5;
|
||||
this.panelLocation.TabIndex = 14;
|
||||
//
|
||||
// panelTimer
|
||||
//
|
||||
@@ -469,7 +469,7 @@
|
||||
this.panelTimer.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelTimer.Name = "panelTimer";
|
||||
this.panelTimer.Size = new System.Drawing.Size(322, 36);
|
||||
this.panelTimer.TabIndex = 3;
|
||||
this.panelTimer.TabIndex = 11;
|
||||
//
|
||||
// labelDuration
|
||||
//
|
||||
@@ -478,7 +478,7 @@
|
||||
this.labelDuration.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelDuration.Name = "labelDuration";
|
||||
this.labelDuration.Size = new System.Drawing.Size(47, 13);
|
||||
this.labelDuration.TabIndex = 2;
|
||||
this.labelDuration.TabIndex = 10;
|
||||
this.labelDuration.Text = "Duration";
|
||||
//
|
||||
// labelTimer
|
||||
@@ -489,7 +489,7 @@
|
||||
this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelTimer.Name = "labelTimer";
|
||||
this.labelTimer.Size = new System.Drawing.Size(48, 20);
|
||||
this.labelTimer.TabIndex = 2;
|
||||
this.labelTimer.TabIndex = 7;
|
||||
this.labelTimer.Text = "Timer";
|
||||
//
|
||||
// labelSize
|
||||
@@ -500,7 +500,7 @@
|
||||
this.labelSize.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
|
||||
this.labelSize.Name = "labelSize";
|
||||
this.labelSize.Size = new System.Drawing.Size(40, 20);
|
||||
this.labelSize.TabIndex = 6;
|
||||
this.labelSize.TabIndex = 19;
|
||||
this.labelSize.Text = "Size";
|
||||
//
|
||||
// panelSize
|
||||
@@ -513,7 +513,7 @@
|
||||
this.panelSize.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelSize.Name = "panelSize";
|
||||
this.panelSize.Size = new System.Drawing.Size(322, 25);
|
||||
this.panelSize.TabIndex = 7;
|
||||
this.panelSize.TabIndex = 20;
|
||||
//
|
||||
// durationUpdateTimer
|
||||
//
|
||||
@@ -552,7 +552,7 @@
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 678);
|
||||
this.flowPanel.TabIndex = 8;
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// panelScrollSpeed
|
||||
@@ -564,7 +564,7 @@
|
||||
this.panelScrollSpeed.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelScrollSpeed.Name = "panelScrollSpeed";
|
||||
this.panelScrollSpeed.Size = new System.Drawing.Size(322, 36);
|
||||
this.panelScrollSpeed.TabIndex = 9;
|
||||
this.panelScrollSpeed.TabIndex = 22;
|
||||
//
|
||||
// TabSettingsNotifications
|
||||
//
|
||||
|
@@ -170,7 +170,7 @@ namespace TweetDuck.Core.Other.Settings{
|
||||
comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = false;
|
||||
notification.ShowExampleNotification(false);
|
||||
|
||||
if (notification.IsFullyOutsideView() && FormMessage.Question("Notification is outside view", "The notification seems to be outside of view, would you like to reset its position?", FormMessage.Yes, FormMessage.No)){
|
||||
if (notification.IsFullyOutsideView() && FormMessage.Question("Notification is Outside View", "The notification seems to be outside of view, would you like to reset its position?", FormMessage.Yes, FormMessage.No)){
|
||||
Config.NotificationPosition = TweetNotification.Position.TopRight;
|
||||
notification.MoveToVisibleLocation();
|
||||
|
||||
|
14
Core/Other/Settings/TabSettingsSounds.Designer.cs
generated
14
Core/Other/Settings/TabSettingsSounds.Designer.cs
generated
@@ -59,7 +59,7 @@
|
||||
this.labelVolumeValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
|
||||
this.labelVolumeValue.Name = "labelVolumeValue";
|
||||
this.labelVolumeValue.Size = new System.Drawing.Size(38, 13);
|
||||
this.labelVolumeValue.TabIndex = 6;
|
||||
this.labelVolumeValue.TabIndex = 1;
|
||||
this.labelVolumeValue.Text = "100%";
|
||||
this.labelVolumeValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||
//
|
||||
@@ -106,7 +106,7 @@
|
||||
this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.labelSoundNotification.Name = "labelSoundNotification";
|
||||
this.labelSoundNotification.Size = new System.Drawing.Size(198, 20);
|
||||
this.labelSoundNotification.TabIndex = 1;
|
||||
this.labelSoundNotification.TabIndex = 0;
|
||||
this.labelSoundNotification.Text = "Custom Sound Notification";
|
||||
//
|
||||
// panelSoundNotification
|
||||
@@ -120,7 +120,7 @@
|
||||
this.panelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelSoundNotification.Name = "panelSoundNotification";
|
||||
this.panelSoundNotification.Size = new System.Drawing.Size(322, 55);
|
||||
this.panelSoundNotification.TabIndex = 2;
|
||||
this.panelSoundNotification.TabIndex = 1;
|
||||
//
|
||||
// labelVolume
|
||||
//
|
||||
@@ -129,7 +129,7 @@
|
||||
this.labelVolume.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
|
||||
this.labelVolume.Name = "labelVolume";
|
||||
this.labelVolume.Size = new System.Drawing.Size(42, 13);
|
||||
this.labelVolume.TabIndex = 4;
|
||||
this.labelVolume.TabIndex = 2;
|
||||
this.labelVolume.Text = "Volume";
|
||||
//
|
||||
// trackBarVolume
|
||||
@@ -140,7 +140,7 @@
|
||||
this.trackBarVolume.Maximum = 100;
|
||||
this.trackBarVolume.Name = "trackBarVolume";
|
||||
this.trackBarVolume.Size = new System.Drawing.Size(148, 30);
|
||||
this.trackBarVolume.TabIndex = 5;
|
||||
this.trackBarVolume.TabIndex = 0;
|
||||
this.trackBarVolume.TickFrequency = 10;
|
||||
this.trackBarVolume.Value = 100;
|
||||
this.trackBarVolume.ValueChanged += new System.EventHandler(this.trackBarVolume_ValueChanged);
|
||||
@@ -158,7 +158,7 @@
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 136);
|
||||
this.flowPanel.TabIndex = 3;
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// panelVolume
|
||||
@@ -169,7 +169,7 @@
|
||||
this.panelVolume.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.panelVolume.Name = "panelVolume";
|
||||
this.panelVolume.Size = new System.Drawing.Size(322, 36);
|
||||
this.panelVolume.TabIndex = 2;
|
||||
this.panelVolume.TabIndex = 3;
|
||||
//
|
||||
// volumeUpdateTimer
|
||||
//
|
||||
|
8
Core/Other/Settings/TabSettingsTray.Designer.cs
generated
8
Core/Other/Settings/TabSettingsTray.Designer.cs
generated
@@ -40,7 +40,7 @@
|
||||
this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
|
||||
this.checkTrayHighlight.Name = "checkTrayHighlight";
|
||||
this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
|
||||
this.checkTrayHighlight.TabIndex = 2;
|
||||
this.checkTrayHighlight.TabIndex = 3;
|
||||
this.checkTrayHighlight.Text = "Enable Highlight";
|
||||
this.checkTrayHighlight.UseVisualStyleBackColor = true;
|
||||
//
|
||||
@@ -52,7 +52,7 @@
|
||||
this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
|
||||
this.comboBoxTrayType.Name = "comboBoxTrayType";
|
||||
this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
|
||||
this.comboBoxTrayType.TabIndex = 0;
|
||||
this.comboBoxTrayType.TabIndex = 1;
|
||||
//
|
||||
// labelTrayIcon
|
||||
//
|
||||
@@ -61,7 +61,7 @@
|
||||
this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
|
||||
this.labelTrayIcon.Name = "labelTrayIcon";
|
||||
this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
|
||||
this.labelTrayIcon.TabIndex = 1;
|
||||
this.labelTrayIcon.TabIndex = 2;
|
||||
this.labelTrayIcon.Text = "Tray Icon";
|
||||
//
|
||||
// labelTray
|
||||
@@ -88,7 +88,7 @@
|
||||
this.flowPanel.Location = new System.Drawing.Point(9, 9);
|
||||
this.flowPanel.Name = "flowPanel";
|
||||
this.flowPanel.Size = new System.Drawing.Size(322, 97);
|
||||
this.flowPanel.TabIndex = 2;
|
||||
this.flowPanel.TabIndex = 0;
|
||||
this.flowPanel.WrapContents = false;
|
||||
//
|
||||
// TabSettingsTray
|
||||
|
@@ -178,16 +178,7 @@ namespace TweetDuck.Core{
|
||||
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);
|
||||
}
|
||||
|
||||
browser.SetupResourceHandler(soundUrl, hasCustomSound ? SoundNotification.CreateFileHandler(Program.UserConfig.NotificationSoundPath) : null);
|
||||
prevSoundNotificationPath = Program.UserConfig.NotificationSoundPath;
|
||||
}
|
||||
|
||||
|
@@ -10,7 +10,6 @@ using TweetDuck.Core.Other;
|
||||
|
||||
namespace TweetDuck.Core.Utils{
|
||||
static class BrowserUtils{
|
||||
public static string HeaderAcceptLanguage => "en-us,en";
|
||||
public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
|
||||
|
||||
public static void SetupCefArgs(IDictionary<string, string> args){
|
||||
@@ -19,6 +18,10 @@ namespace TweetDuck.Core.Utils{
|
||||
args["disable-gpu-vsync"] = "1";
|
||||
}
|
||||
|
||||
if (!Program.UserConfig.EnableSmoothScrolling){
|
||||
args["disable-smooth-scrolling"] = "1";
|
||||
}
|
||||
|
||||
args["disable-pdf-extension"] = "1";
|
||||
args["disable-plugins-discovery"] = "1";
|
||||
args["enable-system-flash"] = "0";
|
||||
@@ -35,8 +38,15 @@ namespace TweetDuck.Core.Utils{
|
||||
return (ChromiumWebBrowser)browserControl;
|
||||
}
|
||||
|
||||
public static DefaultResourceHandlerFactory GetHandlerFactory(this ChromiumWebBrowser browser){
|
||||
return (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
|
||||
public static void SetupResourceHandler(this ChromiumWebBrowser browser, string url, IResourceHandler handler){
|
||||
DefaultResourceHandlerFactory factory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
|
||||
|
||||
if (handler == null){
|
||||
factory.UnregisterHandler(url);
|
||||
}
|
||||
else{
|
||||
factory.RegisterHandler(url, handler);
|
||||
}
|
||||
}
|
||||
|
||||
private const string TwitterTrackingUrl = "t.co";
|
||||
@@ -66,14 +76,25 @@ namespace TweetDuck.Core.Utils{
|
||||
FormGuide.Show(hash);
|
||||
}
|
||||
else{
|
||||
string browserPath = Program.UserConfig.BrowserPath;
|
||||
|
||||
if (browserPath == null || !File.Exists(browserPath)){
|
||||
WindowsUtils.OpenAssociatedProgram(url);
|
||||
}
|
||||
else{
|
||||
try{
|
||||
using(Process.Start(browserPath, url)){}
|
||||
}catch(Exception e){
|
||||
Program.Reporter.HandleException("Error Opening Browser", "Could not open the browser.", true, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case UrlCheckResult.Tracking:
|
||||
if (FormMessage.Warning("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n"+url, FormMessage.Yes, FormMessage.No)){
|
||||
WindowsUtils.OpenAssociatedProgram(url);
|
||||
goto case UrlCheckResult.Fine;
|
||||
}
|
||||
|
||||
break;
|
||||
|
@@ -87,7 +87,7 @@ namespace TweetDuck.Core.Utils{
|
||||
using(SaveFileDialog dialog = new SaveFileDialog{
|
||||
AutoUpgradeEnabled = true,
|
||||
OverwritePrompt = urls.Length == 1,
|
||||
Title = "Save image",
|
||||
Title = "Save Image",
|
||||
FileName = $"{string.Join(" ", fileNameParts.Where(part => part.Length > 0))}{ext}",
|
||||
Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
|
||||
}){
|
||||
@@ -118,7 +118,7 @@ namespace TweetDuck.Core.Utils{
|
||||
using(SaveFileDialog dialog = new SaveFileDialog{
|
||||
AutoUpgradeEnabled = true,
|
||||
OverwritePrompt = true,
|
||||
Title = "Save video",
|
||||
Title = "Save Video",
|
||||
FileName = string.IsNullOrEmpty(username) ? filename : $"{username} {filename}",
|
||||
Filter = "Video"+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
|
||||
}){
|
||||
|
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
@@ -6,6 +7,7 @@ using System.Runtime.InteropServices;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading;
|
||||
using System.Windows.Forms;
|
||||
using Microsoft.Win32;
|
||||
|
||||
namespace TweetDuck.Core.Utils{
|
||||
static class WindowsUtils{
|
||||
@@ -62,7 +64,7 @@ namespace TweetDuck.Core.Utils{
|
||||
}catch(Win32Exception e) when (e.NativeErrorCode == 0x000004C7){ // operation canceled by the user
|
||||
return false;
|
||||
}catch(Exception e){
|
||||
Program.Reporter.HandleException("Error opening file", e.Message, true, e);
|
||||
Program.Reporter.HandleException("Error Opening Program", "Could not open the associated program for "+file, true, e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -130,5 +132,63 @@ namespace TweetDuck.Core.Utils{
|
||||
Program.Reporter.HandleException("Clipboard Error", "TweetDuck could not access the clipboard as it is currently used by another process.", true, e);
|
||||
}
|
||||
}
|
||||
|
||||
public static IEnumerable<Browser> FindInstalledBrowsers(){
|
||||
IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
|
||||
using(RegistryKey root = RegistryKey.OpenBaseKey(hive, RegistryView.Default))
|
||||
using(RegistryKey browserList = root.OpenSubKey(@"SOFTWARE\Clients\StartMenuInternet", false)){
|
||||
if (browserList == null){
|
||||
yield break;
|
||||
}
|
||||
|
||||
foreach(string sub in browserList.GetSubKeyNames()){
|
||||
using(RegistryKey browserKey = browserList.OpenSubKey(sub, false))
|
||||
using(RegistryKey shellKey = browserKey?.OpenSubKey(@"shell\open\command")){
|
||||
if (shellKey == null){
|
||||
continue;
|
||||
}
|
||||
|
||||
string browserName = browserKey.GetValue(null) as string;
|
||||
string browserPath = shellKey.GetValue(null) as string;
|
||||
|
||||
if (string.IsNullOrEmpty(browserName) || string.IsNullOrEmpty(browserPath)){
|
||||
continue;
|
||||
}
|
||||
|
||||
if (browserPath[0] == '"' && browserPath[browserPath.Length-1] == '"'){
|
||||
browserPath = browserPath.Substring(1, browserPath.Length-2);
|
||||
}
|
||||
|
||||
yield return new Browser(browserName, browserPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
HashSet<Browser> browsers = new HashSet<Browser>();
|
||||
|
||||
try{
|
||||
browsers.UnionWith(ReadBrowsersFromKey(RegistryHive.CurrentUser));
|
||||
browsers.UnionWith(ReadBrowsersFromKey(RegistryHive.LocalMachine));
|
||||
}catch{
|
||||
// oops I guess
|
||||
}
|
||||
|
||||
return browsers;
|
||||
}
|
||||
|
||||
public sealed class Browser{
|
||||
public string Name { get; }
|
||||
public string Path { get; }
|
||||
|
||||
public Browser(string name, string path){
|
||||
this.Name = name;
|
||||
this.Path = path;
|
||||
}
|
||||
|
||||
public override int GetHashCode() => Name.GetHashCode();
|
||||
public override bool Equals(object obj) => obj is Browser other && Name == other.Name;
|
||||
public override string ToString() => Name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -4,6 +4,7 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Runtime.Serialization;
|
||||
using System.Text;
|
||||
using TweetDuck.Core.Utils;
|
||||
|
||||
namespace TweetDuck.Data.Serialization{
|
||||
@@ -11,6 +12,44 @@ namespace TweetDuck.Data.Serialization{
|
||||
private const string NewLineReal = "\r\n";
|
||||
private const string NewLineCustom = "\r~\n";
|
||||
|
||||
private static string EscapeLine(string input) => input.Replace("\\", "\\\\").Replace(Environment.NewLine, "\\\r\n");
|
||||
private static string UnescapeLine(string input) => input.Replace(NewLineCustom, Environment.NewLine);
|
||||
|
||||
private static string UnescapeStream(StreamReader reader){
|
||||
string data = reader.ReadToEnd();
|
||||
|
||||
StringBuilder build = new StringBuilder(data.Length);
|
||||
int index = 0;
|
||||
|
||||
while(true){
|
||||
int nextIndex = data.IndexOf('\\', index);
|
||||
|
||||
if (nextIndex == -1 || nextIndex+1 >= data.Length){
|
||||
break;
|
||||
}
|
||||
else{
|
||||
build.Append(data.Substring(index, nextIndex-index));
|
||||
|
||||
char next = data[nextIndex+1];
|
||||
|
||||
if (next == '\\'){ // convert double backslash to single backslash
|
||||
build.Append('\\');
|
||||
index = nextIndex+2;
|
||||
}
|
||||
else if (next == '\r' && nextIndex+2 < data.Length && data[nextIndex+2] == '\n'){ // convert backslash followed by CRLF to custom new line
|
||||
build.Append(NewLineCustom);
|
||||
index = nextIndex+3;
|
||||
}
|
||||
else{ // single backslash
|
||||
build.Append('\\');
|
||||
index = nextIndex+1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return build.Append(data.Substring(index)).ToString();
|
||||
}
|
||||
|
||||
private static readonly ITypeConverter BasicSerializerObj = new BasicTypeConverter();
|
||||
|
||||
public delegate void HandleUnknownPropertiesHandler(T obj, Dictionary<string, string> data);
|
||||
@@ -42,7 +81,7 @@ namespace TweetDuck.Data.Serialization{
|
||||
|
||||
if (serializer.TryWriteType(type, value, out string converted)){
|
||||
if (converted != null){
|
||||
writer.Write($"{prop.Key} {converted.Replace(Environment.NewLine, NewLineCustom)}");
|
||||
writer.Write($"{prop.Key} {EscapeLine(converted)}");
|
||||
writer.Write(NewLineReal);
|
||||
}
|
||||
}
|
||||
@@ -65,7 +104,7 @@ namespace TweetDuck.Data.Serialization{
|
||||
throw new FormatException("Input appears to be a binary file.");
|
||||
}
|
||||
|
||||
foreach(string line in reader.ReadToEnd().Split(new string[]{ NewLineReal }, StringSplitOptions.RemoveEmptyEntries)){
|
||||
foreach(string line in UnescapeStream(reader).Split(new string[]{ NewLineReal }, StringSplitOptions.RemoveEmptyEntries)){
|
||||
int space = line.IndexOf(' ');
|
||||
|
||||
if (space == -1){
|
||||
@@ -73,7 +112,7 @@ namespace TweetDuck.Data.Serialization{
|
||||
}
|
||||
|
||||
string property = line.Substring(0, space);
|
||||
string value = line.Substring(space+1).Replace(NewLineCustom, Environment.NewLine);
|
||||
string value = UnescapeLine(line.Substring(space+1));
|
||||
|
||||
if (props.TryGetValue(property, out PropertyInfo info)){
|
||||
if (!converters.TryGetValue(info.PropertyType, out ITypeConverter serializer)) {
|
||||
|
28
Program.cs
28
Program.cs
@@ -10,7 +10,7 @@ using TweetDuck.Configuration;
|
||||
using TweetDuck.Core;
|
||||
using TweetDuck.Core.Handling.General;
|
||||
using TweetDuck.Core.Other;
|
||||
using TweetDuck.Core.Other.Settings.Export;
|
||||
using TweetDuck.Core.Management;
|
||||
using TweetDuck.Core.Utils;
|
||||
using TweetDuck.Data;
|
||||
using TweetDuck.Updates;
|
||||
@@ -20,7 +20,7 @@ namespace TweetDuck{
|
||||
public const string BrandName = "TweetDuck";
|
||||
public const string Website = "https://tweetduck.chylex.com";
|
||||
|
||||
public const string VersionTag = "1.12.1.1";
|
||||
public const string VersionTag = "1.12.3.1";
|
||||
|
||||
public static readonly bool IsPortable = File.Exists("makeportable");
|
||||
|
||||
@@ -32,6 +32,7 @@ namespace TweetDuck{
|
||||
|
||||
public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
|
||||
private static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
|
||||
private static readonly string CefDataPath = Path.Combine(StoragePath, "TD_Chromium");
|
||||
|
||||
public static string UserConfigFilePath => Path.Combine(StoragePath, "TD_UserConfig.cfg");
|
||||
public static string SystemConfigFilePath => Path.Combine(StoragePath, "TD_SystemConfig.cfg");
|
||||
@@ -117,10 +118,10 @@ namespace TweetDuck{
|
||||
SystemConfig = SystemConfig.Load(SystemConfigFilePath);
|
||||
|
||||
if (Arguments.HasFlag(Arguments.ArgImportCookies)){
|
||||
ExportManager.ImportCookies();
|
||||
ProfileManager.ImportCookies();
|
||||
}
|
||||
else if (Arguments.HasFlag(Arguments.ArgDeleteCookies)){
|
||||
ExportManager.DeleteCookies();
|
||||
ProfileManager.DeleteCookies();
|
||||
}
|
||||
|
||||
if (Arguments.HasFlag(Arguments.ArgUpdated)){
|
||||
@@ -131,10 +132,10 @@ namespace TweetDuck{
|
||||
CefSharpSettings.WcfEnabled = false;
|
||||
|
||||
CefSettings settings = new CefSettings{
|
||||
AcceptLanguageList = BrowserUtils.HeaderAcceptLanguage,
|
||||
UserAgent = BrowserUtils.HeaderUserAgent,
|
||||
BrowserSubprocessPath = BrandName+".Browser.exe",
|
||||
CachePath = StoragePath,
|
||||
UserDataPath = CefDataPath,
|
||||
LogFile = ConsoleLogFilePath,
|
||||
#if !DEBUG
|
||||
LogSeverity = Arguments.HasFlag(Arguments.ArgLogging) ? LogSeverity.Info : LogSeverity.Disable
|
||||
@@ -191,18 +192,6 @@ namespace TweetDuck{
|
||||
}
|
||||
}
|
||||
|
||||
public static void ResetConfig(){
|
||||
try{
|
||||
File.Delete(UserConfigFilePath);
|
||||
File.Delete(UserConfig.GetBackupFile(UserConfigFilePath));
|
||||
}catch(Exception e){
|
||||
Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the options.", true, e);
|
||||
return;
|
||||
}
|
||||
|
||||
UserConfig.Reload();
|
||||
}
|
||||
|
||||
public static void Restart(params string[] extraArgs){
|
||||
CommandLineArgs args = Arguments.GetCurrentClean();
|
||||
CommandLineArgs.ReadStringArray('-', extraArgs, args);
|
||||
@@ -210,14 +199,15 @@ namespace TweetDuck{
|
||||
}
|
||||
|
||||
public static void RestartWithArgs(CommandLineArgs args){
|
||||
FormBrowser browserForm = Application.OpenForms.OfType<FormBrowser>().FirstOrDefault();
|
||||
if (browserForm == null)return;
|
||||
FormBrowser browserForm = FormManager.TryFind<FormBrowser>();
|
||||
|
||||
if (browserForm != null){
|
||||
browserForm.ForceClose();
|
||||
|
||||
ExitCleanup();
|
||||
RestartWithArgsInternal(args);
|
||||
}
|
||||
}
|
||||
|
||||
private static void RestartWithArgsInternal(CommandLineArgs args){
|
||||
args.AddFlag(Arguments.ArgRestart);
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# Support
|
||||
|
||||
[Follow TweetDuck on Twitter](https://twitter.com/TryTweetDuck) | [Support via PayPal](https://paypal.me/chylex) | [Support via Patreon](https://www.patreon.com/chylex)
|
||||
[Follow the developer](https://twitter.com/chylexmc) | [Support via PayPal](https://paypal.me/chylex) | [Support via Patreon](https://www.patreon.com/chylex)
|
||||
|
||||
# Build Instructions
|
||||
|
||||
|
@@ -23,6 +23,10 @@ namespace TweetDuck{
|
||||
}
|
||||
|
||||
public bool Log(string data){
|
||||
#if DEBUG
|
||||
Debug.WriteLine(data);
|
||||
#endif
|
||||
|
||||
StringBuilder build = new StringBuilder();
|
||||
|
||||
if (!File.Exists(logFile)){
|
||||
|
@@ -280,7 +280,7 @@
|
||||
"<html "+Array.prototype.map.call(document.documentElement.attributes, ele => `${ele.name}="${ele.value}"`).join(" ")+"><head>"
|
||||
];
|
||||
|
||||
$(document.head).children("link[href*='css/font.']:first,link[href*='css/app-"+themeName+".']:first,meta[charset],meta[http-equiv]").each(function(){
|
||||
$(document.head).children("link[rel='stylesheet'],meta[charset]").each(function(){
|
||||
tags.push($(this)[0].outerHTML);
|
||||
});
|
||||
|
||||
@@ -759,14 +759,14 @@
|
||||
// Block: Allow drag & drop behavior for dropping links on columns to open their detail view.
|
||||
//
|
||||
(function(){
|
||||
const 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;
|
||||
|
||||
const events = {
|
||||
dragover: function(e){
|
||||
e.originalEvent.dataTransfer.dropEffect = isDraggingValid ? "move" : "none";
|
||||
e.originalEvent.dataTransfer.dropEffect = isDraggingValid ? "all" : "none";
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
},
|
||||
@@ -1278,6 +1278,15 @@
|
||||
};
|
||||
}
|
||||
|
||||
//
|
||||
// Block: Remove column mouse wheel handler, which allows smooth scrolling inside columns, and horizontally scrolling column container when holding Shift.
|
||||
//
|
||||
if (ensurePropertyExists(TD, "ui", "columns", "setupColumn")){
|
||||
TD.ui.columns.setupColumn = appendToFunction(TD.ui.columns.setupColumn, function(e){
|
||||
$(".js-column[data-column='"+e.model.getKey()+"']").off("mousewheel onmousewheel");
|
||||
});
|
||||
}
|
||||
|
||||
//
|
||||
// Block: Detect and notify about connection issues.
|
||||
//
|
||||
|
@@ -44,6 +44,10 @@
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
#td-introduction-modal p:last-child {
|
||||
margin-top: 18px;
|
||||
}
|
||||
|
||||
#td-introduction-modal footer {
|
||||
padding: 10px 0;
|
||||
}
|
||||
@@ -78,10 +82,10 @@
|
||||
<div class="mdl-inner">
|
||||
<div class="mdl-content">
|
||||
<p>Thank you for downloading TweetDuck!</p>
|
||||
<p><a id="td-introduction-follow" href="#">Follow @TryTweetDuck</a> for latest news and updates about the app.</p>
|
||||
<div class="main-menu"></div>
|
||||
<p><strong>Right-click anywhere</strong> or click <strong>Settings – TweetDuck</strong> in the left panel to open the main menu. You can also right-click links, tweets, images and videos, and desktop notifications to access their respective context menus.</p>
|
||||
<p>Click <strong>Show Guide</strong> to see awesome features TweetDuck offers, or view the guide later by going to <strong>About TweetDuck</strong> and clicking the help button on top.</p>
|
||||
<p>Follow the developer <a id="td-introduction-follow" href="#">@chylexmc</a> for latest news & updates about the app, and some occasional rants.</p>
|
||||
</div>
|
||||
<footer class="txt-right">
|
||||
<div class="anondata">
|
||||
@@ -102,7 +106,7 @@
|
||||
onSuccess(tdUser);
|
||||
}
|
||||
else{
|
||||
TD.controller.clients.getPreferredClient().getUsersByIds([ "731137856052269056" ], users => onSuccess(users[0]), onError);
|
||||
TD.controller.clients.getPreferredClient().getUsersByIds([ "572571847" ], users => onSuccess(users[0]), onError);
|
||||
}
|
||||
};
|
||||
|
||||
|
@@ -159,7 +159,7 @@
|
||||
<Compile Include="Core\Other\FormPlugins.Designer.cs">
|
||||
<DependentUpon>FormPlugins.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Core\Other\Management\VideoPlayer.cs" />
|
||||
<Compile Include="Core\Management\VideoPlayer.cs" />
|
||||
<Compile Include="Core\Other\Settings\Dialogs\DialogSettingsAnalytics.cs">
|
||||
<SubType>Form</SubType>
|
||||
</Compile>
|
||||
@@ -213,8 +213,7 @@
|
||||
<Compile Include="Core\Utils\StringUtils.cs" />
|
||||
<Compile Include="Core\Utils\TwitterUtils.cs" />
|
||||
<Compile Include="Data\CombinedFileStream.cs" />
|
||||
<Compile Include="Core\Other\Settings\Export\ExportFileFlags.cs" />
|
||||
<Compile Include="Core\Other\Settings\Export\ExportManager.cs" />
|
||||
<Compile Include="Core\Management\ProfileManager.cs" />
|
||||
<Compile Include="Core\Other\Settings\TabSettingsAdvanced.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
@@ -294,7 +293,7 @@
|
||||
<Compile Include="Core\Other\TrayIcon.Designer.cs">
|
||||
<DependentUpon>TrayIcon.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Core\Utils\BrowserCache.cs" />
|
||||
<Compile Include="Core\Management\BrowserCache.cs" />
|
||||
<Compile Include="Core\Utils\BrowserUtils.cs" />
|
||||
<Compile Include="Core\Utils\NativeMethods.cs" />
|
||||
<Compile Include="Updates\UpdateDownloadStatus.cs" />
|
||||
|
@@ -13,7 +13,9 @@ namespace UnitTests.Data{
|
||||
private class SerializationTestBasic{
|
||||
public bool TestBool { get; set; }
|
||||
public int TestInt { get; set; }
|
||||
public string TestString { get; set; }
|
||||
public string TestStringBasic { get; set; }
|
||||
public string TestStringNewLine { get; set; }
|
||||
public string TestStringBackslash { get; set; }
|
||||
public string TestStringNull { get; set; }
|
||||
public TestEnum TestEnum { get; set; }
|
||||
}
|
||||
@@ -25,7 +27,9 @@ namespace UnitTests.Data{
|
||||
SerializationTestBasic write = new SerializationTestBasic{
|
||||
TestBool = true,
|
||||
TestInt = -100,
|
||||
TestString = "abc"+Environment.NewLine+"def",
|
||||
TestStringBasic = "hello123",
|
||||
TestStringNewLine = "abc"+Environment.NewLine+"def"+Environment.NewLine,
|
||||
TestStringBackslash = @"C:\Test\\\Abc\",
|
||||
TestStringNull = null,
|
||||
TestEnum = TestEnum.D
|
||||
};
|
||||
@@ -38,7 +42,9 @@ namespace UnitTests.Data{
|
||||
|
||||
Assert.IsTrue(read.TestBool);
|
||||
Assert.AreEqual(-100, read.TestInt);
|
||||
Assert.AreEqual("abc"+Environment.NewLine+"def", read.TestString);
|
||||
Assert.AreEqual("hello123", read.TestStringBasic);
|
||||
Assert.AreEqual("abc"+Environment.NewLine+"def"+Environment.NewLine, read.TestStringNewLine);
|
||||
Assert.AreEqual(@"C:\Test\\\Abc\", read.TestStringBackslash);
|
||||
Assert.IsNull(read.TestStringNull);
|
||||
Assert.AreEqual(TestEnum.D, read.TestEnum);
|
||||
}
|
||||
|
@@ -102,8 +102,10 @@ namespace TweetDuck.Video{
|
||||
}
|
||||
|
||||
private void player_MediaError(object pMediaObject){
|
||||
Console.Out.WriteLine(((IWMPMedia2)pMediaObject).Error.errorDescription);
|
||||
IWMPErrorItem error = ((IWMPMedia2)pMediaObject).Error;
|
||||
Console.Out.WriteLine($"Media Error {error.errorCode}: {error.errorDescription}");
|
||||
|
||||
Marshal.ReleaseComObject(error);
|
||||
Marshal.ReleaseComObject(pMediaObject);
|
||||
Environment.Exit(Program.CODE_MEDIA_ERROR);
|
||||
}
|
||||
|
@@ -5,7 +5,7 @@ using System.Windows.Forms;
|
||||
|
||||
namespace TweetDuck.Video{
|
||||
static class Program{
|
||||
internal const string Version = "1.2.1.0";
|
||||
internal const string Version = "1.2.2.0";
|
||||
|
||||
// referenced in VideoPlayer
|
||||
// set by task manager -- public const int CODE_PROCESS_KILLED = 1;
|
||||
@@ -40,7 +40,7 @@ namespace TweetDuck.Video{
|
||||
try{
|
||||
Application.Run(new FormPlayer(ownerHandle, defaultVolume, videoUrl, pipeToken));
|
||||
}catch(Exception e){
|
||||
Console.Out.WriteLine(e.Message);
|
||||
Console.Out.WriteLine(e);
|
||||
return CODE_LAUNCH_FAIL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user