Commit 17c0effb: - upgraded the ribbon...

- upgraded the ribbon...

17c0effb

Dimitar Tsenev

committed Nov 2, 2014

Files

Details



	BEHelper
	NoFlickerWindowsFormsHost.cs
	BExplorer/BetterExplorer
	Customize
	CustomizeQAT.xaml.cs
	App.xaml.cs
	BetterExplorer.csproj
	Fluent.dll
	MainWindow.xaml
	MainWindow.xaml.cs
	ConsoleControl
	ConsoleControl.csproj
	Shell
	MessageHandler.cs
	ShellViewEx.cs
	WpfControlLibrary1
	BetterExplorerControls.csproj
	SearchBox.xaml
	BExplorer.sln

NoFlickerWindowsFormsHost.cs

-2+32

/BEHelper/NoFlickerWindowsFormsHost.cs

View

using System.Threading.Tasks;

using System.Windows;

using System.Windows.Forms.Integration;

using System.Windows.Interop;

namespace BEHelper {

public class NoFlickerWindowsFormsHost : WindowsFormsHost {

public class NoFlickerWindowsFormsHost :

//HwndHost {

// [DllImport( "user32.dll", SetLastError = true )]

// static extern IntPtr CreateWindowEx( IntPtr exStyle, string lpClassName,string lpWindowName,int dwStyle,int x,int y,int nWidth,int nHeight,IntPtr hWndParent,IntPtr hMenu,IntPtr hInstance,IntPtr lpParam );

// protected override HandleRef BuildWindowCore( HandleRef hWndParent ) {

// return new HandleRef(this, CreateWindowEx(IntPtr.Zero, "static", "", (int)(0x40000000L | 0x10000000L | 0x02000000L), 0, 0, (int)this.ActualWidth, (int)this.ActualHeight, hWndParent.Handle, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero));

// }

// protected override void DestroyWindowCore( HandleRef hwnd ) { }

// }

WindowsFormsHost {

const uint SWP_NOZORDER = 0x0004;

const uint SWP_NOACTIVATE = 0x0010;

const uint SWP_ASYNCWINDOWPOS = 0x4000;

public static readonly Int32 GWL_STYLE = -16;

public static readonly UInt32 WS_CHILD = 0x40000000;

[DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]

internal static extern IntPtr SetParent(IntPtr hWnd, IntPtr hWndParent);

[DllImport("user32.dll")]

internal static extern int GetWindowLong(IntPtr hWnd, Int32 nIndex);

[DllImport("user32.dll")]

internal static extern UInt32 SetWindowLong(IntPtr hWnd, Int32 nIndex, UInt32 dwNewLong);

internal int GetWindowStyle(IntPtr hWnd) {

return (int)GetWindowLong(hWnd, GWL_STYLE);

}

internal void SetWindowStyle(IntPtr hWnd, int windowStyle) {

SetWindowLong(hWnd, GWL_STYLE, (UInt32)windowStyle);

}

[DllImport("user32.dll")]

extern static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);

protected override HandleRef BuildWindowCore(HandleRef hwndParent) {

SetWindowStyle(hwndParent.Handle, 0x02000000 | GetWindowStyle(hwndParent.Handle));

return base.BuildWindowCore(hwndParent);

}

protected override void OnWindowPositionChanged(Rect rcBoundingBox) {

if (Handle != IntPtr.Zero) {

SetWindowPos(Handle,

CustomizeQAT.xaml.cs

-3+3

/BExplorer/BetterExplorer/Customize/CustomizeQAT.xaml.cs

View

#region DO NOT DELETE (yet) [From: Aaron Campf]

var AllMenuItems = MainForm.TheRibbon.QuickAccessItems.Select(x => x.Target).ToList();

var Controls = (from control in MainForm.TheRibbon.QuickAccessToolbarItems

select control.Key as Control into newControl

var Controls = (from control in MainForm.TheRibbon.QuickAccessItems

select control as Control into newControl

where !AllMenuItems.Any(x => x.Name == newControl.Name)

select newControl).ToList();

#endregion

AllMenuItems.AddRange(Controls);

//Here add visible elements since we want to show in that dialog only visible elements into the QAT.

//Maybe have to find a way to show all elements even not visible and do some handling to display them properly

foreach (var item in MainForm.TheRibbon.QuickAccessToolbarItems.Select(s => s.Key as Control).ToList()) {

foreach (var item in MainForm.TheRibbon.QuickAccessItems.Select(s => s as Control).ToList()) {

QATControls.Items.Add(GetRibbonItemListDisplay(item as IRibbonControl));

}

App.xaml.cs

+27

/BExplorer/BetterExplorer/App.xaml.cs

View

string Locale = ""; bool dmi = true;

Application.Current.DispatcherUnhandledException += new DispatcherUnhandledExceptionEventHandler(Current_DispatcherUnhandledException);

AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);

//RegistryKey rk = Registry.CurrentUser;

//RegistryKey rks = rk.OpenSubKey(@"Software\BExplorer", true);

//// loads current Ribbon color theme

//try {

// var Color = Convert.ToString(rks.GetValue("CurrentTheme", "Blue"));

// switch (Color) {

// case "Blue":

// case "Silver":

// case "Black":

// case "Green":

// Application.Current.Resources.MergedDictionaries.RemoveAt(0);

// Application.Current.Resources.MergedDictionaries.Insert(0, new ResourceDictionary() { Source = new Uri("pack://application:,,,/Fluent;component/Themes/Generic.xaml") });

// break;

// case "Metro":

// Application.Current.Resources.MergedDictionaries.RemoveAt(0);

// Application.Current.Resources.MergedDictionaries.Insert(0, new ResourceDictionary() { Source = new Uri("pack://application:,,,/Fluent;component/Themes/Office2013/Generic.xaml") });

// break;

// default:

// Application.Current.Resources.MergedDictionaries.RemoveAt(0);

// Application.Current.Resources.MergedDictionaries.Insert(0, new ResourceDictionary() { Source = new Uri("pack://application:,,,/Fluent;component/Themes/Generic.xaml") });

// break;

// }

//} catch (Exception ex) {

// MessageBox.Show(String.Format("An error occurred while trying to load the theme data from the Registry. \n\r \n\r{0}\n\r \n\rPlease let us know of this issue at http://bugtracker.better-explorer.com/", ex.Message), "RibbonTheme Error - " + ex.ToString());

//}

//rks.Close();

//rk.Close();

if (e.Args != null && e.Args.Any()) {

dmi = e.Args.Contains("/nw") || e.Args[0] == "t";

isStartWithStartupTab = e.Args.Contains("/norestore");

BetterExplorer.csproj

/BExplorer/BetterExplorer/BetterExplorer.csproj

View

Fluent.dll

/BExplorer/BetterExplorer/Fluent.dll

View