Merge branch 'main' of https://git.azuze.fr/kawa/Sharepoint-Toolbox

2026-04-24 10:50:19 +02:00
parent 12dd1de9f2 f4cc81bb71
commit b8c09655ac
14 changed files with 523 additions and 0 deletions
@@ -16,8 +16,12 @@
        <!-- Action bar: new folder (destination mode only) -->
        <StackPanel x:Name="ActionBar" DockPanel.Dock="Top" Orientation="Horizontal"
                    Margin="0,0,0,6" Visibility="Collapsed">
+<<<<<<< HEAD
            <Button x:Name="NewFolderButton"
                    Content="{Binding Source={x:Static loc:TranslationSource.Instance}, Path=[common.new_folder]}"
+=======
+            <Button x:Name="NewFolderButton" Content="+ New Folder"
+>>>>>>> f4cc81bb71b935c6f6f050288c9e283dcca5cfa8
                    Padding="8,3" Click="NewFolder_Click" IsEnabled="False" />
        </StackPanel>