Popupmenu im MissedCallPane für Anruftermine

Kruemelino · Jan 8, 2023 · b9f4add · b9f4add
1 parent df6f162
commit b9f4add
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 19 deletions.
diff --git a/FBoxDial/Formulare/AnrMon/AnrMonWPF.xaml b/FBoxDial/Formulare/AnrMon/AnrMonWPF.xaml
@@ -90,10 +90,6 @@
                           Content="{DynamicResource HamburgerMenu_16x}" Tag="{StaticResource HamburgerMenu_16x}"
                           Style="{StaticResource MiniIconToggleButton}" 
                           MouseEnter="BOptionen_MouseEnter" MouseLeave="BOptionen_MouseLeave"/>
-
-            <!--<Button Style="{StaticResource MiniIconButton}"
-                    Content="{DynamicResource CallTo_16x}" 
-                    Command="{Binding CallCommand}" />-->
 
             <Button Style="{StaticResource MiniIconButton}"
                     Content="{DynamicResource StatusNo_16x}" 

diff --git a/FBoxDial/Formulare/CallListPane/View/MissedCallView.xaml b/FBoxDial/Formulare/CallListPane/View/MissedCallView.xaml
@@ -81,14 +81,11 @@
                     Content="{DynamicResource Close_16x}"
                     Command="{Binding CloseCommand}" 
                     CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"/>
-
-            <Button Style="{StaticResource MiniIconButton}"
-                    Content="{DynamicResource CallTo_16x}" 
-                    Command="{Binding CallCommand}" />
-
-            <Button Style="{StaticResource MiniIconButton}"
-                    Content="{DynamicResource ContactCard_16x}" 
-                    Command="{Binding ShowContactCommand}" />
+
+            <ToggleButton x:Name="bOptionen" 
+                          Content="{DynamicResource HamburgerMenu_16x}" Tag="{StaticResource HamburgerMenu_16x}"
+                          Style="{StaticResource MiniIconToggleButton}" 
+                          MouseEnter="BOptionen_MouseEnter" MouseLeave="BOptionen_MouseLeave"/>
 
             <Button Command="{Binding PlayMessageCommand}"
                     Visibility="{Binding TAMMessageAvailable, Converter={StaticResource BoolToVisibilityConverter}}">
@@ -112,7 +109,30 @@
                     Content="{DynamicResource StatusNo_16x}" 
                     Command="{Binding BlockCommand}" 
                     Visibility="{Binding ZeigeBlockButton, Converter={StaticResource BoolToVisibilityConverter}}"/>
-
+
+            <Popup Name="OptionPopup" 
+                   IsOpen="{Binding ElementName=bOptionen, Path=IsChecked}" 
+                   PlacementTarget="{Binding ElementName=bOptionen}" Placement="Relative"
+                   AllowsTransparency="True" 
+                   PopupAnimation="Slide" 
+                   StaysOpen="False">
+
+                <StackPanel>
+                    <Button Style="{StaticResource MiniIconButton}" Margin="0,0,4,0"
+                            Content="{DynamicResource CallTo_16x}" 
+                            Command="{Binding CallCommand}" />
+
+                    <Button Style="{StaticResource MiniIconButton}"
+                            Content="{DynamicResource Calendar_16x}" 
+                            Command="{Binding AppointmentCommand}" />
+
+                    <Button Style="{StaticResource MiniIconButton}"
+                            Content="{DynamicResource ContactCard_16x}" 
+                            Command="{Binding ShowContactCommand}" />
+
+                </StackPanel>
+            </Popup>
+
         </StackPanel>         
     </Grid>
 

diff --git a/FBoxDial/Formulare/CallListPane/View/MissedCallView.xaml.vb b/FBoxDial/Formulare/CallListPane/View/MissedCallView.xaml.vb
@@ -1,5 +1,7 @@
 Imports System.Windows.Markup
 Imports System.Threading
+Imports System.Windows.Input
+
 Public Class MissedCallView
     Public Sub New()
 
@@ -10,4 +12,12 @@ Public Class MissedCallView
         Language = XmlLanguage.GetLanguage(Thread.CurrentThread.CurrentCulture.Name)
 
     End Sub
+
+    Private Sub BOptionen_MouseEnter(sender As Object, e As MouseEventArgs)
+        OptionPopup.StaysOpen = True
+    End Sub
+
+    Private Sub BOptionen_MouseLeave(sender As Object, e As MouseEventArgs)
+        OptionPopup.StaysOpen = False
+    End Sub
 End Class
diff --git a/FBoxDial/Formulare/CallListPane/ViewModel/MissedCallViewModel.vb b/FBoxDial/Formulare/CallListPane/ViewModel/MissedCallViewModel.vb
@@ -182,6 +182,7 @@ Public Class MissedCallViewModel
     Public Property ShowContactCommand As RelayCommand
     Public Property BlockCommand As RelayCommand
     Public Property PlayMessageCommand As RelayCommand
+    Public Property AppointmentCommand As RelayCommand
 #End Region
     Public Sub New(dataService As IAnrMonService, dialogservice As IDialogService)
 
@@ -194,7 +195,7 @@ Public Class MissedCallViewModel
         ShowContactCommand = New RelayCommand(AddressOf ShowContact)
         BlockCommand = New RelayCommand(AddressOf BlockNumber)
         PlayMessageCommand = New RelayCommand(AddressOf PlayMessage)
-
+        AppointmentCommand = New RelayCommand(AddressOf AddAppointment)
     End Sub
 
     Private Async Sub LadeDaten()
@@ -336,6 +337,9 @@ Public Class MissedCallViewModel
 
     End Sub
 
+    Private Sub AddAppointment(o As Object)
+        VerpasstesTelefonat?.ErstelleErinnerungEintrag()
+    End Sub
 #End Region
 
     Private Sub AnzuzeigendeDaten()

diff --git a/FBoxDial/FritzBoxDial.vbproj b/FBoxDial/FritzBoxDial.vbproj
@@ -159,7 +159,7 @@
       <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.1.0\lib\net46\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.1.1\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Office, Version=14.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>

diff --git a/FBoxDial/My Project/AssemblyInfo.vb b/FBoxDial/My Project/AssemblyInfo.vb
@@ -36,8 +36,8 @@ Imports System.Security
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("5.0.3.18")>
-<Assembly: AssemblyFileVersion("5.0.3.18")>
+<Assembly: AssemblyVersion("5.0.3.19")>
+<Assembly: AssemblyFileVersion("5.0.3.19")>
 <Assembly: NeutralResourcesLanguage("de-DE")>
 Friend Module DesignTimeConstants
     Public Const RibbonTypeSerializer As String = "Microsoft.VisualStudio.Tools.Office.Ribbon.Serialization.RibbonTypeCodeDomSerializer, Microsoft.VisualStudio.Tools.Office.Designer, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"

diff --git a/FBoxDial/packages.config b/FBoxDial/packages.config
@@ -5,6 +5,6 @@
   <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net48" />
   <package id="MixERP.Net.VCards" version="1.0.7" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net48" />
-  <package id="NLog" version="5.1.0" targetFramework="net48" />
+  <package id="NLog" version="5.1.1" targetFramework="net48" />
   <package id="PixiEditor.ColorPicker" version="3.3.1" targetFramework="net48" />
 </packages>
diff --git a/Installer/installer.iss b/Installer/installer.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Fritz!Box Telefon-dingsbums"
-#define MyAppVersion "5.0.3.18"
+#define MyAppVersion "5.0.3.19"
 #define MyAppPublisher "Kruemelino"
 #define MyAppURL "https://github.com/Kruemelino/FritzBoxTelefon-dingsbums"
 #define MyAppDescription "Das Fritz!Box Telefon-dingsbums ist ein Addin für Outlook (2010-2021), welches ein direktes Wählen der Kontakte aus dem Computer ermöglicht. Zusätzlich bietet es nützliche Funktionen, wie einen Anrufmonitor oder eine Rückwärtssuche."