From c19ed551c1a1a209e17f3a6a5a158b90ee4bcabc Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
<161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Sat, 10 Jan 2026 11:11:06 +0000
Subject: [PATCH 1/3] Redesign MainWindow to match provided mockup
- Refactored MainWindow.xaml to use a sidebar layout with a custom top bar.
- Replaced the top Menu with a horizontal stack of buttons; moved menu items (Settings, Help, etc.) into ContextMenus.
- Grouped Icon Mode and Search Mode controls into the left sidebar.
- Integrated the "Load Folders" and "Generate Icons" buttons into the sidebar.
- Styled the UI using HandyControl DynamicResources for theme compatibility.
- Added missing resources (TopBarButton, SidebarRadioButton, StatusBarSeparator) to Window.Resources.
- Updated MainWindow.xaml.cs to robustly handle the language selection event.
- Restored missing menu items (Explorer Integration, Error Reporting) and icons.
---
FoliCon/Views/MainWindow.xaml | 582 ++++++++++++++++---------------
FoliCon/Views/MainWindow.xaml.cs | 6 +-
2 files changed, 308 insertions(+), 280 deletions(-)
diff --git a/FoliCon/Views/MainWindow.xaml b/FoliCon/Views/MainWindow.xaml
index d52cef0c..cf815298 100644
--- a/FoliCon/Views/MainWindow.xaml
+++ b/FoliCon/Views/MainWindow.xaml
@@ -1,4 +1,4 @@
-
+ d:DataContext="{d:DesignInstance viewModels:MainWindowViewModel}" Closed="MainWindow_OnClosed"
+ NonClientAreaVisible="True" WindowStyle="SingleBorderWindow"
+ Background="{DynamicResource RegionBrush}">
+
+
+
+
+
+
+
@@ -53,293 +88,286 @@
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/FoliCon/Views/MainWindow.xaml.cs b/FoliCon/Views/MainWindow.xaml.cs
index 52bde57c..b5ff375e 100644
--- a/FoliCon/Views/MainWindow.xaml.cs
+++ b/FoliCon/Views/MainWindow.xaml.cs
@@ -13,13 +13,13 @@ public MainWindow()
private void CmbLanguage_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
-
- if (CmbLanguage.SelectedItem is null)
+ var comboBox = sender as System.Windows.Controls.ComboBox;
+ if (comboBox?.SelectedItem is null)
{
return;
}
- var selectedLanguage = (Languages)CmbLanguage.SelectedValue;
+ var selectedLanguage = (Languages)comboBox.SelectedValue;
var cultureInfo = CultureUtils.GetCultureInfoByLanguage(selectedLanguage);
LangProvider.Culture = cultureInfo;
Thread.CurrentThread.CurrentCulture = cultureInfo;
From 8615a05a07589d45c26124ca6eb13161712fdcf8 Mon Sep 17 00:00:00 2001
From: Dinesh Solanki <15937452+dineshsolanki@users.noreply.github.com>
Date: Sat, 10 Jan 2026 17:27:29 +0530
Subject: [PATCH 2/3] fix broken properties
---
FoliCon/Views/MainWindow.xaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/FoliCon/Views/MainWindow.xaml b/FoliCon/Views/MainWindow.xaml
index cf815298..0b2df84f 100644
--- a/FoliCon/Views/MainWindow.xaml
+++ b/FoliCon/Views/MainWindow.xaml
@@ -20,7 +20,7 @@
ui:FolderDragDropHelper.IsFileDragDropEnabled="True"
ui:FolderDragDropHelper.FileDragDropTarget="{Binding}" AllowDrop="True"
d:DataContext="{d:DesignInstance viewModels:MainWindowViewModel}" Closed="MainWindow_OnClosed"
- NonClientAreaVisible="True" WindowStyle="SingleBorderWindow"
+ ShowNonClientArea="True" WindowStyle="SingleBorderWindow"
Background="{DynamicResource RegionBrush}">
@@ -246,7 +246,7 @@
-
+