Skip to content

Commit 0ceb4e3

Browse files
NethNickNethNick
authored
Merge pull request #11 from nethesis/disable_popup
Changed UX with popups and paramurl
2 parents 1739598 + fc07f08 commit 0ceb4e3

16 files changed

Lines changed: 471 additions & 299 deletions

File tree

‎NethDialer/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("3.0.10.0")>
35-
<Assembly: AssemblyFileVersion("3.0.10.0")>
34+
<Assembly: AssemblyVersion("3.1.0.0")>
35+
<Assembly: AssemblyFileVersion("3.1.0.0")>

‎NethDialer/NethDialer.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
125125
</PropertyGroup>
126126
<PropertyGroup>
127-
<SignManifests>true</SignManifests>
127+
<SignManifests>false</SignManifests>
128128
</PropertyGroup>
129129
<ItemGroup>
130130
<Reference Include="System" />

‎NethDialer/obj/Debug/NethDialer.vbproj.FileListAbsolute.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,12 @@ C:\Users\Utente\source\repos\nethifier-220222\NethDialer\obj\Debug\NethDialer.vb
1919
C:\Users\Utente\source\repos\nethifier-220222\NethDialer\obj\Debug\NethDialer.exe
2020
C:\Users\Utente\source\repos\nethifier-220222\NethDialer\obj\Debug\NethDialer.xml
2121
C:\Users\Utente\source\repos\nethifier-220222\NethDialer\obj\Debug\NethDialer.pdb
22+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.AssemblyReference.cache
23+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.Form1.resources
24+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.Resources.resources
25+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.GenerateResource.cache
26+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.vbproj.CoreCompileInputs.cache
27+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.TrustInfo.xml
28+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.exe
29+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.xml
30+
C:\Users\Utente\Source\Repos\nethifier\NethDialer\obj\Debug\NethDialer.pdb

‎NethHeadPhone/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all values ​​or set default values ​​for revision and build numbers
3333
// using the asterisk '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("3.0.10.0")]
36-
[assembly: AssemblyFileVersion("3.0.10.0")]
35+
[assembly: AssemblyVersion("3.1.0.0")]
36+
[assembly: AssemblyFileVersion("3.1.0.0")]

‎NethLED/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("3.0.10.0")>
35-
<Assembly: AssemblyFileVersion("3.0.10.0")>
34+
<Assembly: AssemblyVersion("3.1.0.0")>
35+
<Assembly: AssemblyFileVersion("3.1.0.0")>

‎NethUtilities/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("3.0.10.0")>
35-
<Assembly: AssemblyFileVersion("3.0.10.0")>
34+
<Assembly: AssemblyVersion("3.1.0.0")>
35+
<Assembly: AssemblyFileVersion("3.1.0.0")>

‎Nethifier/CLS_COMMON.vb‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ Friend Class Config
7272
Public PARAM_CHECK As Boolean = False
7373
Public PARAM_MODE As String
7474
Public POPUP_POS As Int32 = 0
75+
Public POPUP_INOLTRO As Boolean = False
76+
Public POPUP_NEW_CALL As Boolean = False
77+
Public POPUP_INTERNI As Boolean = False
7578

7679
Public Commands As Hashtable = New Hashtable
7780
Public LANGUAGE As String = "default"
@@ -116,6 +119,8 @@ Friend Class Config
116119
"PARAM_CHECK=" & CStr(IIf(Me.PARAM_CHECK, "1", "0")) & vbCrLf &
117120
"PARAM_MODE=" & Me.PARAM_MODE & vbCrLf &
118121
"POPUP_POS=" & Me.POPUP_POS & vbCrLf &
122+
"POPUP_INOLTRO=" & CStr(IIf(Me.POPUP_INOLTRO, "1", "0")) & vbCrLf &
123+
"POPUP_INTERNI=" & CStr(IIf(Me.POPUP_INTERNI, "1", "0")) & vbCrLf &
119124
"LANGUAGE=" & Me.LANGUAGE & vbCrLf &
120125
"HOTKEY_MOD_SPEED_DIAL=" & Me.HOTKEY_MOD_SPEED_DIAL & vbCrLf &
121126
"HOTKEY_MOD_REDIAL=" & Me.HOTKEY_MOD_REDIAL & vbCrLf &
@@ -206,6 +211,10 @@ Friend Class Config
206211
P_POS = True
207212
Me.POPUP_POS = CInt(Val)
208213
X += 1
214+
ElseIf Key.StartsWith("POPUP_INOLTRO=") Then
215+
Me.POPUP_INOLTRO = (Val = "1")
216+
ElseIf Key.StartsWith("POPUP_INTERNI=") Then
217+
Me.POPUP_INTERNI = (Val = "1")
209218
ElseIf Key.StartsWith("LANGUAGE=") Then
210219
Me.LANGUAGE = Val
211220
X += 1

‎Nethifier/FRM_CALL_NOTIFICATIONS.vb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Friend NotInheritable Class FRM_CALL_NOTIFICATIONS
2424
Me.UserLogin = UserLogin
2525
Me.NethDebug = NethDebug
2626

27-
2827
ExceptionManager = New ExceptionManager
2928
End Sub
3029

‎Nethifier/FRM_CONFIG.Designer.vb‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Nethifier/FRM_CONFIG.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,12 @@
712712
<metadata name="TIP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
713713
<value>781, 17</value>
714714
</metadata>
715+
<metadata name="TIP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
716+
<value>781, 17</value>
717+
</metadata>
718+
<metadata name="TIP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
719+
<value>781, 17</value>
720+
</metadata>
715721
<metadata name="FILE_DLG.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
716722
<value>521, 17</value>
717723
</metadata>

0 commit comments

Comments
 (0)