From 6786d74cad2095c2f83612d691e63f10454c569f Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Fri, 22 Sep 2023 19:14:41 +0200 Subject: [PATCH 1/4] Gestione nuova interfaccia scura --- MainWindow/MainWindowV.xaml | 1 + Resources/DetailPage/Photo.png | Bin 604 -> 3650 bytes Resources/DetailPage/Remove.png | Bin 0 -> 703 bytes Resources/TopCommandBar/Search.png | Bin 2023 -> 2498 bytes TopCommandBar/TopCommandBarV.xaml | 9 +- Utility/Dictionary.xaml | 1100 +++++++++++++++++----------- 6 files changed, 680 insertions(+), 430 deletions(-) create mode 100644 Resources/DetailPage/Remove.png diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml index 16179ac..fc95a48 100644 --- a/MainWindow/MainWindowV.xaml +++ b/MainWindow/MainWindowV.xaml @@ -6,6 +6,7 @@ xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib" DataContext="{StaticResource MainWindowVM}" Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}" + TitleBarForeground="{StaticResource Omag_White}" Title="{Binding Title}" Icon="/Resources/OmagPHOTO.ico" MinHeight="600" MinWidth="800" AboutBoxCommand="{Binding AboutBoxCommand}" WindowStyle="None" ResizeMode="NoResize" diff --git a/Resources/DetailPage/Photo.png b/Resources/DetailPage/Photo.png index 9fa4c5f52d0f23050351744550c8e91daea8604c..ab8e9336a88290886a9f104b5b28aeacd2d3b618 100644 GIT binary patch literal 3650 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 delta 580 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 literal 2023 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf2Yg9HK~#8N?V4Lm z6jvO^&vL&n1W-_56+wxJ3aODOH>-)2BGHz{nA++?AKE5O)%L{%;zM6d+C-yGYl3NF zFxJGRjkZ2$YM?@*&;lx#76Ijs!YWr~m)&*xeaEqBjctLMu@L8%Om;oz%&_M>|JymE zMNt&-vg4(GzSNi^08<2DiU3RzfGGknMF6GyWUZH zdwWH2aIjo)3gB|NZ1)sHxamcFl(2;zrVPD|Gwa7QBl#)#l^*W>X3ir z*s)`kM~@y&-nen&{F<5?87Jn?pHJ8Et*EGQtHTUKHxUX83zhEfZt34^*RBFP9h_bRW%X9@GSFT*i z#(h3()~pfU-rmB;$LIazhjq@-G_0OZJ#Blfzwx{l%DA#vx<9a(Fr zU522^5=u);mD8tBOE(Az2oQ+$x~vVv{gwrJc5_>eohP5a z;(6orx^yX<*RNl%czJna*EcL~-n^;VB$h2()|H-~9)IuNJ<-+GRngwwzCrCW1kKrj zAfKo6=#0h9jvYHRsk&v$mU8SSFJ@HT~@mcLl+TvB$l6_FV7IJU%xIkZQ4|! zc1??I+qPXsy%B5F6VxNc>JUTFMFfH$?#mM)W{dv*{#=-|a^l2^O11l6 zIdkUBHSQee&71eC)oOi(DbeMc6k}uK6gC_~KE$)jj5>DH?NEjAcnuk2sH>}6PQu4W z{^ojE$;i%~JLA&Q(vsys(9qD(ilEwe_Uzf9@$vDH%*@ObS`qIV9UXPzckPLZiTRd$ z6IujH^KRVMiFCQWrKQFGH(S;h+y9UU!CoLE`%bQ#=@jg5`r zkvsoBCM6;xBjs3*W6DK*sm6p0TrO7`((r3;w+FjPcMrx-;yJIQnEGA*K^@Rtgs1RC z$j{I3s-K^~uv)|93Uh*EV`H*EG&EFR6o$v}4<0rly8)%uJY-mOzkcVz77UcRD8#H#~O4iDU%B zVYOQ7v|4&bPpFoST*=+qh?dEGgq*gob z`J2`J7qiw92w%bV_4Q?|FLq zlhf&RqwizHi?7sMr^Kwc1VWQXwYiTzkAf)*EB-aoVk)Y~F|2$6-(o|IM-V7~x&n|n zVF`pm5@z3wi6$dG3jQY$ZmyUfVFBEb6w-B`jGi8IMg+o264p@37q!8`L39(o17+3t z=1c`3b4mn)%K1BdY{&0D1*_PE&$qM)K<1nX43Y?hSMk*Y5%y>mfXq1&2(tnLr5gd$ zp*Cq^PKuy6b0S3=jVS^!MF6G + ToolTip="{Binding SearchToolTip}" + Style="{StaticResource TopCmdBar_ToggleButton}"> diff --git a/Utility/Dictionary.xaml b/Utility/Dictionary.xaml index e82f4fe..4cc31df 100644 --- a/Utility/Dictionary.xaml +++ b/Utility/Dictionary.xaml @@ -6,462 +6,577 @@ xmlns:EgtPHOTOLib="clr-namespace:EgtPHOTOLib;assembly=EgtPHOTOLib" xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"> - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - None + 0 + 0.25 + 0.5 - + + + + + + + - - + + + + + - + + + + + - + + + + + + + + + + + - - - - - - - - - - + + + + + - - - - + + + None - - - - - - - - + - + + - + - + - + + + + + + + + + + - + - + + + + - + + + + + + + + - + - + - - - + - + - + - - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + - + - + - + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + - + - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + M 0 0 L 3.5 4 L 7 0 Z + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + From a57c60aa477d7e6c9a5c0492d0fe5f4f4165e249 Mon Sep 17 00:00:00 2001 From: Nicola Pievani Date: Mon, 12 Feb 2024 15:03:05 +0100 Subject: [PATCH 2/4] Aggiornata versione 2.6b1 --- MainWindow/MainWindowM.vb | 4 ++-- My Project/AssemblyInfo.vb | 4 ++-- Utility/Dictionary.xaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MainWindow/MainWindowM.vb b/MainWindow/MainWindowM.vb index 205930b..7538731 100644 --- a/MainWindow/MainWindowM.vb +++ b/MainWindow/MainWindowM.vb @@ -209,8 +209,8 @@ Public Class MainWindowM Dim bNetHwKey As Boolean = (GetMainPrivateProfileInt(S_GENERAL, K_NETKEY, 0) = 1) EgtSetNetHwKey(bNetHwKey) ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(9423, 2508, 1, m_nKeyLevel) And - EgtGetKeyOptions(9423, 2508, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(9423, 2602, 1, m_nKeyLevel) And + EgtGetKeyOptions(9423, 2602, 1, m_nKeyOptions) ' Verifico abilitazione prodotto Dim bProd As Boolean = GetKeyOption(KEY_OPT.PHOTO_BASE) ' Inizializzazione generale di EgtInterface diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index 36e5937..6d39cab 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -59,5 +59,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/Utility/Dictionary.xaml b/Utility/Dictionary.xaml index 4cc31df..3d7d7fe 100644 --- a/Utility/Dictionary.xaml +++ b/Utility/Dictionary.xaml @@ -196,7 +196,7 @@ + + + +