chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-05-28 17:34:06 +02:00
Code

Move HasDevTools to BrowserUtils

Browse Source
This commit is contained in:
chylex 2018-07-08 10:06:40 +02:00
parent 31b5d9a4c0
commit b0883229bf
7 changed files with 13 additions and 21 deletions

7
Core/Handling/ContextMenuBase.cs
View File

@ -15,8 +15,6 @@
namespace TweetDuck.Core.Handling{ namespace TweetDuck.Core.Handling{
abstract class ContextMenuBase : IContextMenuHandler{ abstract class ContextMenuBase : IContextMenuHandler{
public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality; private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
private const CefMenuCommand MenuOpenLinkUrl = (CefMenuCommand)26500; private const CefMenuCommand MenuOpenLinkUrl = (CefMenuCommand)26500;
@ -238,7 +236,10 @@ protected static void InsertSelectionSearchItem(IMenuModel model, CefMenuCommand
} }
protected static void AddDebugMenuItems(IMenuModel model){ protected static void AddDebugMenuItems(IMenuModel model){
model.AddItem(MenuOpenDevTools, "Open dev tools"); if (BrowserUtils.HasDevTools){
AddSeparator(model);
model.AddItem(MenuOpenDevTools, "Open dev tools");
}
} }
protected static void RemoveSeparatorIfLast(IMenuModel model){ protected static void RemoveSeparatorIfLast(IMenuModel model){

7
Core/Handling/ContextMenuBrowser.cs
View File

@ -83,11 +83,8 @@ public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser br
globalMenu.AddItem(MenuSettings, TitleSettings); globalMenu.AddItem(MenuSettings, TitleSettings);
globalMenu.AddItem(MenuPlugins, TitlePlugins); globalMenu.AddItem(MenuPlugins, TitlePlugins);
globalMenu.AddItem(MenuAbout, TitleAboutProgram); globalMenu.AddItem(MenuAbout, TitleAboutProgram);
if (HasDevTools){ AddDebugMenuItems(globalMenu);
globalMenu.AddSeparator();
AddDebugMenuItems(globalMenu);
}
} }
RemoveSeparatorIfLast(model); RemoveSeparatorIfLast(model);

6
Core/Handling/ContextMenuGuide.cs
View File

@ -8,11 +8,7 @@ public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){ public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
model.Clear(); model.Clear();
base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model); base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
AddDebugMenuItems(model);
if (HasDevTools){
AddSeparator(model);
AddDebugMenuItems(model);
}
} }
} }
} }

6
Core/Handling/ContextMenuNotification.cs
View File

@ -47,11 +47,7 @@ public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser br
} }
} }
if (HasDevTools){ AddDebugMenuItems(model);
AddSeparator(model);
AddDebugMenuItems(model);
}
RemoveSeparatorIfLast(model); RemoveSeparatorIfLast(model);
form.InvokeAsyncSafe(() => { form.InvokeAsyncSafe(() => {

3
Core/Handling/RequestHandlerBase.cs
View File

@ -2,6 +2,7 @@
using CefSharp; using CefSharp;
using CefSharp.Handler; using CefSharp.Handler;
using TweetDuck.Core.Handling.General; using TweetDuck.Core.Handling.General;
using TweetDuck.Core.Utils;
namespace TweetDuck.Core.Handling{ namespace TweetDuck.Core.Handling{
class RequestHandlerBase : DefaultRequestHandler{ class RequestHandlerBase : DefaultRequestHandler{
@ -16,7 +17,7 @@ public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser brows
} }
public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){ public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
if (ContextMenuBase.HasDevTools){ if (BrowserUtils.HasDevTools){
NameValueCollection headers = request.Headers; NameValueCollection headers = request.Headers;
headers.Remove("x-devtools-emulate-network-conditions-client-id"); headers.Remove("x-devtools-emulate-network-conditions-client-id");
request.Headers = headers; request.Headers = headers;

3
Core/Other/Analytics/AnalyticsReportGenerator.cs
View File

@ -8,7 +8,6 @@
using System.Linq; using System.Linq;
using System.Management; using System.Management;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using TweetDuck.Core.Handling;
using TweetDuck.Core.Notification; using TweetDuck.Core.Notification;
using TweetDuck.Core.Utils; using TweetDuck.Core.Utils;
using TweetDuck.Plugins; using TweetDuck.Plugins;
@ -22,7 +21,7 @@ public static AnalyticsReport Create(AnalyticsFile file, ExternalInfo info, Plug
return new AnalyticsReport{ return new AnalyticsReport{
{ "App Version" , Program.VersionTag }, { "App Version" , Program.VersionTag },
{ "App Type" , Program.IsPortable ? "portable" : "installed" }, { "App Type" , Program.IsPortable ? "portable" : "installed" },
{ "App Dev Tools" , Bool(ContextMenuBase.HasDevTools) }, { "App Dev Tools" , Bool(BrowserUtils.HasDevTools) },
0, 0,
{ "System Name" , SystemName }, { "System Name" , SystemName },
{ "System Edition" , SystemEdition }, { "System Edition" , SystemEdition },

2
Core/Utils/BrowserUtils.cs
View File

@ -13,6 +13,8 @@ namespace TweetDuck.Core.Utils{
static class BrowserUtils{ static class BrowserUtils{
public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion; public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion;
public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36"; public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36";
public static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
public static void SetupCefArgs(IDictionary<string, string> args){ public static void SetupCefArgs(IDictionary<string, string> args){
if (!Program.SystemConfig.HardwareAcceleration){ if (!Program.SystemConfig.HardwareAcceleration){