Skip to content

Commit

Permalink
- some fixes before the release
Browse files Browse the repository at this point in the history
  • Loading branch information
@DimitarCC
DimitarCC committed May 31, 2013
1 parent bd5e571 commit adcc1b8
Show file tree
Hide file tree
Showing 7 changed files with 259 additions and 250 deletions.
Binary file modified BExplorer/BetterExplorer/Better Explorer.wyp
View file
Binary file not shown.
81 changes: 44 additions & 37 deletions BExplorer/BetterExplorer/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1975,8 +1975,8 @@ void ExplorerBrowserControl_SelectionChanged(object sender, EventArgs e)


IsSelectionRized = false;
if (!IsAfterFolderCreate && !backstage.IsOpen && IsAfterRename)
Explorer.SetExplorerFocus();
//if (!IsAfterFolderCreate && !backstage.IsOpen && IsAfterRename)
// Explorer.SetExplorerFocus();
}
bool IsFromSelectionOrNavigation = false;

Expand Down Expand Up @@ -2816,6 +2816,7 @@ private void MenuItem_Click_1(object sender, RoutedEventArgs e)
// New Folder/Library
private void Button_Click_2(object sender, RoutedEventArgs e)
{
Explorer.SetExplorerFocus();
string path = "";

bool IsLib = false;
Expand All @@ -2833,17 +2834,17 @@ private void Button_Click_2(object sender, RoutedEventArgs e)

LastPath = path;

if (IsCompartibleRename)
{
Explorer.RefreshExplorer();
//if (IsCompartibleRename)
//{
// Explorer.RefreshExplorer();

}
else
{
//}
//else
//{
WindowsAPI.SHChangeNotify(WindowsAPI.HChangeNotifyEventID.SHCNE_MKDIR,
WindowsAPI.HChangeNotifyFlags.SHCNF_PATHW | WindowsAPI.HChangeNotifyFlags.SHCNF_FLUSHNOWAIT,
Marshal.StringToHGlobalAuto(path.Replace(@"\\", @"\")), IntPtr.Zero);
}
//}


IsAfterRename = false;
Expand All @@ -2854,10 +2855,6 @@ private void Button_Click_2(object sender, RoutedEventArgs e)
IsLibW = IsLib;
IsAfterFolderCreate = true;


Explorer.Focus();


}


Expand Down Expand Up @@ -3692,22 +3689,14 @@ public MainWindow() {
private void Window_Loaded(object sender, RoutedEventArgs e)
{
UpdateRecycleBinInfos();
if (App.isStartMinimized)
{
this.Visibility = System.Windows.Visibility.Hidden;
this.WindowState = System.Windows.WindowState.Minimized;
//this.ShowInTaskbar = false;
}


r = new MessageReceiver();
r.OnMessageReceived += r_OnMessageReceived;
r.Show();

bool exitApp = false;




try
{
if (WindowsAPI.getOSInfo() == WindowsAPI.OsVersionInfo.Windows8)
Expand Down Expand Up @@ -3744,7 +3733,6 @@ private void Window_Loaded(object sender, RoutedEventArgs e)

FavPath = "";
}

//UpdateRecycleBinInfos();
//' set up breadcrumb bar
breadcrumbBarControl1.SetDragHandlers(new DragEventHandler(bbi_DragEnter), new DragEventHandler(bbi_DragLeave), new DragEventHandler(bbi_DragOver), new DragEventHandler(bbi_Drop));
Expand Down Expand Up @@ -3855,6 +3843,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
btnBlue.IsChecked = true;
break;
}

LastUpdateCheck = DateTime.FromBinary(Convert.ToInt64(rks.GetValue(@"LastUpdateCheck", 0)));

UpdateCheckInterval = (int)rks.GetValue(@"CheckInterval", 7);
Expand Down Expand Up @@ -4189,30 +4178,48 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
AppJL.JumpItems.Add(newTab);
AppJL.JumpItems.Add(newWindow);
AppJL.Apply();

//Setup Clipboard monitor
cbm.ClipboardChanged += new EventHandler<ClipboardChangedEventArgs>(cbm_ClipboardChanged);

autoUpdater.DaysBetweenChecks = this.UpdateCheckInterval;
try {
if (IsUpdateCheck) {
try
{
if (IsUpdateCheck)
{
autoUpdater.UpdateType = UpdateType.OnlyCheck;
} else {
autoUpdater.UpdateType = UpdateType.DoNothing;
}
if (IsUpdateCheckStartup) {
autoUpdater.ForceCheckForUpdate();
}
} catch (IOException) {
this.stiUpdate.Content = "Switch to another BetterExplorer window or restart to check for updates.";
this.btnUpdateCheck.IsEnabled = false;
}
}
else
{
autoUpdater.UpdateType = UpdateType.DoNothing;
}
if (IsUpdateCheckStartup)
{
autoUpdater.ForceCheckForUpdate();
}
}
catch (IOException)
{
this.stiUpdate.Content = "Switch to another BetterExplorer window or restart to check for updates.";
this.btnUpdateCheck.IsEnabled = false;
}

if (App.isStartMinimized)
{
this.Visibility = System.Windows.Visibility.Hidden;
this.WindowState = System.Windows.WindowState.Minimized;
//this.ShowInTaskbar = false;
}



//}
//));
// });
// t.Start();





if (exitApp)
{
Expand Down
8 changes: 4 additions & 4 deletions BExplorer/BetterExplorer/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyDescription("A better file manager.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Dimitar Tsenev / Jayke R. Huempfner")]
[assembly: AssemblyProduct("Better Explorer Beta 2")]
[assembly: AssemblyProduct("Better Explorer Beta 3")]
[assembly: AssemblyCopyright("Copyright © 2012-2013 Dimitar Tsenev and Jayke R. Huempfner")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand Down Expand Up @@ -51,6 +51,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.3.17051")]
[assembly: AssemblyFileVersion("2.0.3.17051")]
[assembly: AssemblyInformationalVersion("2.0.3.130426.17051 Beta 2 Update 1")]
[assembly: AssemblyVersion("2.0.3.27051")]
[assembly: AssemblyFileVersion("2.0.3.27051")]
[assembly: AssemblyInformationalVersion("2.0.3.130531.27051 Beta 3")]
Binary file modified BExplorer/BetterExplorer/wyUpdate/client.wyc
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Updater/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ static void Main(string[] arguments) {
String CurrentexePath = System.Reflection.Assembly.GetExecutingAssembly().GetModules()[0].FullyQualifiedName;
string dir = Path.GetDirectoryName(CurrentexePath);
foreach (var item in updateFiles) {
MessageBox.Show(item);
ListOrExtract(item, dir, true);
}
}
Expand Down
Loading

0 comments on commit adcc1b8

Please sign in to comment.