diff --git a/CallMyPhone.pro.user b/CallMyPhone.pro.user index f808c26..466256d 100644 --- a/CallMyPhone.pro.user +++ b/CallMyPhone.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -62,7 +62,7 @@ Desktop Qt 5.11.0 MinGW 32bit Desktop Qt 5.11.0 MinGW 32bit qt.qt5.5110.win32_mingw53_kit - 1 + 0 0 0 @@ -285,14 +285,14 @@ 2 CallMyPhone - - Qt4ProjectManager.Qt4RunConfiguration:C:/Users/k.batmanov/Documents/CallMyPhone/CallMyPhone.pro + CallMyPhone2 + Qt4ProjectManager.Qt4RunConfiguration:C:/Users/k.batmanov/Documents/github/Konstantin2/CallMyPhone/CallMyPhone.pro true "+79012010251" "Батманов Константин" CallMyPhone.pro false - C:/Users/k.batmanov/Documents/build-CallMyPhone-Desktop_Qt_5_11_0_MinGW_32bit-Release + C:/Users/k.batmanov/Documents/build-CallMyPhone-Desktop_Qt_5_11_0_MinGW_32bit-Debug 3768 false true diff --git a/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/.suo b/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/.suo index 4f4739e..d419fc5 100644 Binary files a/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/.suo and b/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/.suo differ diff --git a/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-shm b/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-shm index 64f62f5..97d43a9 100644 Binary files a/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-shm and b/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-shm differ diff --git a/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-wal b/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-wal index a0a1aa1..2a5c3b3 100644 Binary files a/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-wal and b/CallMyPhoneOutlookAddIn/.vs/CallMyPhoneOutlookAddIn/v15/Server/sqlite3/storage.ide-wal differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.dll deleted file mode 100644 index 52041e5..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.dll.manifest b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.dll.manifest deleted file mode 100644 index 58e6927..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.dll.manifest +++ /dev/null @@ -1,188 +0,0 @@ - - - - CallMyPhoneOutlookAddIn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1MtA21CwGPXqbp2jpLyOOQ9wK20DzQ0aS9cJ2Ttn9Ws= - - - - - - - - - - - - jLCTF8Mm6bD4PDN+rnzN6q0+ReXaNgPh68kMWgatFwI= - - - - - - - - - - - - AY9f4ogMVBnNqNKvGc0Ko8U3XsIDeLhU/c5jky7x2Zc= - - - - - - - - - - - - - - - - - - - CallMyPhoneOutlookAddIn - CallMyPhoneOutlookAddIn - - - - - - -aj6YVa/y3dFTJ9fNq9Wmoqrnj5J+vLm2/qBNvB8JbXo=gPyrjdCysPGWZZnppvmnGcq/pEQJrlc5edMSjjkjMfnsJ6e1Yr/W/TDiPdHTY/tPfhLuNVojn8exDLEoPN8+9aBCAF+459Ta7g+2hO8jS/13QmtYwHS1tgWt1h7Nc+wi7aDiBpP7/r++hY+gczE6bGIMnnXtqeYScqNKKO2YfDY=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABCN=OKB\k.batmanovQePmrtGSw+PscMVtEYcCJDeDoIVZZLam9XjpV0h6Qdk=A5TENqb0JQ5FM5A9nkOql+QBJKor7zSzcCDarExBA3YQpYLTC9NQIC0TY8vRqsLYbr40HRuDs0nAvz18dnT0H5XTK13+pvakD6260a4CdRDHUczyl87q1vS42HGtV9M81gfkSXzDmsDDs1ifzE9gCYM+z3ZgS46qSv2FkOuN0gc=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABMIIB0TCCATqgAwIBAgIQPpdADWagPIdB4kWWQ7OcnTANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDHhwATwBLAEIAXABrAC4AYgBhAHQAbQBhAG4AbwB2MB4XDTE5MDEzMTExNDcxM1oXDTIwMDEzMTE3NDcxM1owJzElMCMGA1UEAx4cAE8ASwBCAFwAawAuAGIAYQB0AG0AYQBuAG8AdjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awECAwEAATANBgkqhkiG9w0BAQsFAAOBgQA1fDwnYnixlumAGpqvAJ4SqLpD03ebsqOJFNMGczAH3s0RgAbw6VwJ68m7mrzuytmMsXCtWcF07GPkQp5zvS+JmhnrjJJmwoUGFf+h3gOLoy9wLXsHcJZg3+tY3QYwdnpIRMgbE3YMe/bcjiuPVJZRpfVmI5KVr1lcGdU869yTQw== \ No newline at end of file diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.pdb b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.pdb deleted file mode 100644 index 53aaf7b..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.pdb and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.vsto b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.vsto deleted file mode 100644 index f64f7fc..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/CallMyPhoneOutlookAddIn.vsto +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - omihvhF+9ha6OrkFLVJz/ptFu4WijQ7dthpcUZHGYMw= - - - -cRXtu9mtTzXerd60u1zYi8oqAiAvslMuf1fHPizJYS8=mH0z/OOEfqvAuruWgfFx+55rtrWNykSHwhrGHHyJmqFYuYKvGBhktIDv5PCJX+9Dq/3lRCI4IM3Ka6AvYZ4D+YAMtPeJuw45B7epsjzoLWvDhlTcDl91ms36sAb60EJ89DDLfIsjRrV22FtaIcb8oeqD/2Ru7NoT1R3VQzkOg2U=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABCN=OKB\k.batmanov39LW8Qhz6rDobFdRi4pNWx357vTf5IFMNHfcemJRvkE=eDc6co/DBrQjJC4eYaJFgZu9baoW4hEhcudqsB3xSLnL1I/QUlsCa5S50Yyqq8nh3piA4OsjtGphqURrqPyYJUwioGBq19OnK4GhIhDWT1GgMbDDFavx65JEnFaO/yFWQ5UvGQjjjX6hVY/82U7KZdiq5yE3t5qz0agIpCZQcuU=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABMIIB0TCCATqgAwIBAgIQPpdADWagPIdB4kWWQ7OcnTANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDHhwATwBLAEIAXABrAC4AYgBhAHQAbQBhAG4AbwB2MB4XDTE5MDEzMTExNDcxM1oXDTIwMDEzMTE3NDcxM1owJzElMCMGA1UEAx4cAE8ASwBCAFwAawAuAGIAYQB0AG0AYQBuAG8AdjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awECAwEAATANBgkqhkiG9w0BAQsFAAOBgQA1fDwnYnixlumAGpqvAJ4SqLpD03ebsqOJFNMGczAH3s0RgAbw6VwJ68m7mrzuytmMsXCtWcF07GPkQp5zvS+JmhnrjJJmwoUGFf+h3gOLoy9wLXsHcJZg3+tY3QYwdnpIRMgbE3YMe/bcjiuPVJZRpfVmI5KVr1lcGdU869yTQw== \ No newline at end of file diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/Microsoft.Office.Tools.Common.v4.0.Utilities.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/Microsoft.Office.Tools.Common.v4.0.Utilities.dll deleted file mode 100644 index 03a6ef8..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/Microsoft.Office.Tools.Common.v4.0.Utilities.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll deleted file mode 100644 index e5f57e0..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Debug/Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.dll deleted file mode 100644 index 891741f..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.dll.manifest b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.dll.manifest deleted file mode 100644 index 73970d3..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.dll.manifest +++ /dev/null @@ -1,188 +0,0 @@ - - - - CallMyPhoneOutlookAddIn - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JXL31nPZHin5UkW9iDlrSxCrtaICd5sWIOBOYnaW5vg= - - - - - - - - - - - - jLCTF8Mm6bD4PDN+rnzN6q0+ReXaNgPh68kMWgatFwI= - - - - - - - - - - - - AY9f4ogMVBnNqNKvGc0Ko8U3XsIDeLhU/c5jky7x2Zc= - - - - - - - - - - - - - - - - - - - CallMyPhoneOutlookAddIn - CallMyPhoneOutlookAddIn - - - - - - -OwkTwPFYZY3Ce7soT0luZPhiDV6kHIOliDsGBx1RAB8=OC2swZLZw7gyGHku+c2g7hZ0oXgttS9ZS8jPhQaTkuU9xf1tT/zllWWEUDXxA/7hvxoNMIsoy24o9VdrtZkAjZqMhWs8cwnGL7t7sjC4ZTXvKFVzKAbUj6BgvIgI5GS1T5ffrf5HAdsGbEnqnDmOIdORAVa6i908XR5MCG/TFo8=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABCN=OKB\k.batmanov2wAsAgroJ44ghR3FtjEIO+Z5r0kqWaghGZ8N3Y3du18=ceEmzYXpJNeRTH/+Zt7s10r0tTjDizDMLxtDke8Wp3i26f2N9RSfuE4aYqrUm0howO9de5DkLtG0dOMLtieWcH34F+JWgUwWAScRo1Obp/TqjqecE8tq9NVs6Tt91bsBTYaC94rJGAnKHrpbicF8RMzEvrROiQYjmBl7WfFuxn8=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABMIIB0TCCATqgAwIBAgIQPpdADWagPIdB4kWWQ7OcnTANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDHhwATwBLAEIAXABrAC4AYgBhAHQAbQBhAG4AbwB2MB4XDTE5MDEzMTExNDcxM1oXDTIwMDEzMTE3NDcxM1owJzElMCMGA1UEAx4cAE8ASwBCAFwAawAuAGIAYQB0AG0AYQBuAG8AdjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awECAwEAATANBgkqhkiG9w0BAQsFAAOBgQA1fDwnYnixlumAGpqvAJ4SqLpD03ebsqOJFNMGczAH3s0RgAbw6VwJ68m7mrzuytmMsXCtWcF07GPkQp5zvS+JmhnrjJJmwoUGFf+h3gOLoy9wLXsHcJZg3+tY3QYwdnpIRMgbE3YMe/bcjiuPVJZRpfVmI5KVr1lcGdU869yTQw== \ No newline at end of file diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.pdb b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.pdb deleted file mode 100644 index 322977d..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.pdb and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.vsto b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.vsto deleted file mode 100644 index 6c68793..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/CallMyPhoneOutlookAddIn.vsto +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - gtFOVyA2ZbuiiiACzpBi3CvZD5LYDlXQf+yrQ1tyJGQ= - - - -W9JXM0OERIAUFJEw6wV8sHhXj2VRQqirMHgeFMN64co=Q81o1IoH1RWrF0L4Szu5eYgfhsZLzgKW8Lz2k27TZfxqpPMxa6iv/EnZQM9b7OoD3PXGBsH1vcMSxqzJ06OOJfnQuWwvmqVMHfZPKS1MsbFmr1p4lkfqEXj/HKlZC8QIDey59sdgD4hKLMbJKhNx7shfuWEtlK7VRAF0iQNA6Xk=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABCN=OKB\k.batmanovdDi9PTi8OTD+mug8TLqBxUpmCItnLvt+sb8Adr+QYv8=MFu3RqGlHLAH5m7AtUR5OU876psb9ZN2yhoZEAlZalpbQjy4dT6U/sorgkhyLb/bCNf3bkYz7AkoFn9+/VK3E8GPeDdIKPYj8ZtieU9lcSR7YO27ZjxnIuJZw0/FtPdHRQMmGyw0fkXw9+HVdfZRs8L5+BXskAOFv9Lj28fZ2H8=xQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awE=AQABMIIB0TCCATqgAwIBAgIQPpdADWagPIdB4kWWQ7OcnTANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDHhwATwBLAEIAXABrAC4AYgBhAHQAbQBhAG4AbwB2MB4XDTE5MDEzMTExNDcxM1oXDTIwMDEzMTE3NDcxM1owJzElMCMGA1UEAx4cAE8ASwBCAFwAawAuAGIAYQB0AG0AYQBuAG8AdjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxQHHy7WOPrmmHVXWdzeNo0MrPuJsVsrOLKxxMQJaqKa8IZPoAPnMvS0wtLtlQhtuxN8ngGSfvvOfiT+H36dPYfUYTpp4Bp442dxB9z6rFyisRMyuT73v6LyieHyv6LhTOJrJNRVaeOvv0V0Y3OArzf0JGtTRkKaowvLzOvn0awECAwEAATANBgkqhkiG9w0BAQsFAAOBgQA1fDwnYnixlumAGpqvAJ4SqLpD03ebsqOJFNMGczAH3s0RgAbw6VwJ68m7mrzuytmMsXCtWcF07GPkQp5zvS+JmhnrjJJmwoUGFf+h3gOLoy9wLXsHcJZg3+tY3QYwdnpIRMgbE3YMe/bcjiuPVJZRpfVmI5KVr1lcGdU869yTQw== \ No newline at end of file diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/Microsoft.Office.Tools.Common.v4.0.Utilities.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/Microsoft.Office.Tools.Common.v4.0.Utilities.dll deleted file mode 100644 index 03a6ef8..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/Microsoft.Office.Tools.Common.v4.0.Utilities.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll deleted file mode 100644 index e5f57e0..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/bin/Release/Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.Properties.Resources.resources b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.Properties.Resources.resources and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.CopyComplete b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache deleted file mode 100644 index a109d40..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -3ed9582ceaf3c04b93ab901f2e4cc15d07344422 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.FileListAbsolute.txt b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.FileListAbsolute.txt deleted file mode 100644 index f81bb4f..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,12 +0,0 @@ -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Debug\CallMyPhoneOutlookAddIn.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Debug\CallMyPhoneOutlookAddIn.pdb -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Debug\CallMyPhoneOutlookAddIn.dll.manifest -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Debug\CallMyPhoneOutlookAddIn.vsto -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Debug\Microsoft.Office.Tools.Common.v4.0.Utilities.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Debug\Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Debug\CallMyPhoneOutlookAddIn.Properties.Resources.resources -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Debug\CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Debug\CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Debug\CallMyPhoneOutlookAddIn.csproj.CopyComplete -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Debug\CallMyPhoneOutlookAddIn.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Debug\CallMyPhoneOutlookAddIn.pdb diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache deleted file mode 100644 index d9cfd27..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.dll deleted file mode 100644 index 52041e5..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.pdb b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.pdb deleted file mode 100644 index 53aaf7b..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/CallMyPhoneOutlookAddIn.pdb and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 75eda36..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.Properties.Resources.resources b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.Properties.Resources.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.Properties.Resources.resources and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.CopyComplete b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache deleted file mode 100644 index a109d40..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -3ed9582ceaf3c04b93ab901f2e4cc15d07344422 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.FileListAbsolute.txt b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.FileListAbsolute.txt deleted file mode 100644 index 8b70dd5..0000000 --- a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,25 +0,0 @@ -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.pdb -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.dll.manifest -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.vsto -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\Microsoft.Office.Tools.Common.v4.0.Utilities.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.Properties.Resources.resources -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csproj.CopyComplete -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.dll -C:\Users\k.batmanov\source\repos\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.pdb -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.dll -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.pdb -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.dll.manifest -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\CallMyPhoneOutlookAddIn.vsto -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\Microsoft.Office.Tools.Common.v4.0.Utilities.dll -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\bin\Release\Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csprojAssemblyReference.cache -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.Properties.Resources.resources -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csproj.CoreCompileInputs.cache -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.csproj.CopyComplete -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.dll -C:\Users\k.batmanov\Documents\CallMyPhone\CallMyPhoneOutlookAddIn\CallMyPhoneOutlookAddIn\obj\Release\CallMyPhoneOutlookAddIn.pdb diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache deleted file mode 100644 index d9cfd27..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csproj.GenerateResource.cache and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csprojAssemblyReference.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csprojAssemblyReference.cache deleted file mode 100644 index 44b15af..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.csprojAssemblyReference.cache and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.dll b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.dll deleted file mode 100644 index 891741f..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.dll and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.pdb b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.pdb deleted file mode 100644 index 322977d..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/CallMyPhoneOutlookAddIn.pdb and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 4bde47a..0000000 Binary files a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/CallMyPhoneOutlookAddIn/CallMyPhoneOutlookAddIn/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000 diff --git a/ContactsForm.ui.qml b/ContactsForm.ui.qml index d82ad15..1239583 100644 --- a/ContactsForm.ui.qml +++ b/ContactsForm.ui.qml @@ -7,6 +7,7 @@ Item { property alias listModel: listModel ScrollView { + anchors.leftMargin: 5 anchors.fill: parent ListView { @@ -18,6 +19,8 @@ Item { delegate: ItemDelegate { width: parent.width + height: 50 + Column { width: parent.width Text { diff --git a/LastcallsForm.ui.qml b/LastcallsForm.ui.qml index e29b69b..5368d11 100644 --- a/LastcallsForm.ui.qml +++ b/LastcallsForm.ui.qml @@ -55,6 +55,7 @@ Item { delegate: ItemDelegate { width: parent.width + height: 50 highlighted: ListView.isCurrentItem onClicked: lastcalls_listView.currentIndex = index @@ -64,6 +65,8 @@ Item { // } Column { width: parent.width + spacing: 2 + Text { font.pixelSize: 20 text: name diff --git a/OptionsForm.ui.qml b/OptionsForm.ui.qml index 5fa2fdf..2c61700 100644 --- a/OptionsForm.ui.qml +++ b/OptionsForm.ui.qml @@ -2,7 +2,8 @@ import QtQuick 2.4 import QtQuick.Controls 2.2 Item { - width: 400 + id: item1 + width: 630 height: 400 property alias button: button property alias phone_url: phone_url @@ -12,61 +13,81 @@ Item { Grid { id: grid - anchors.topMargin: 50 + anchors.leftMargin: 4 + anchors.topMargin: 60 columns: 2 + spacing: 6 anchors.fill: parent + Label { id: label text: qsTr("Адрес телефона") - font.pointSize: 18 + font.pointSize: 16 } TextField { id: phone_url + width: 400 text: settings.phone_url - font.pixelSize: 18 + // anchors.right: parent.right + // anchors.rightMargin: 200 + // anchors.right: parent.right + // anchors.rightMargin: 20 + font.pixelSize: 16 } Label { id: label1 text: qsTr("Пользователь") - font.pointSize: 18 + font.pointSize: 16 } TextField { id: phone_user + width: 400 text: settings.phone_user - font.pixelSize: 18 + // anchors.right: parent.right + // anchors.rightMargin: 20 + font.pixelSize: 16 } Label { id: label2 text: qsTr("Пароль") - font.pointSize: 18 + font.pointSize: 16 } TextInput { id: phone_passwd + width: 400 text: settings.phone_passwd + // anchors.right: parent.right + // anchors.rightMargin: 11 echoMode: TextInput.Password - font.pixelSize: 18 + font.pixelSize: 16 } Label { id: label3 text: qsTr("Ваш номер") - font.pointSize: 18 + font.pointSize: 16 } TextField { id: outgoing_uri + width: 400 text: settings.outgoing_uri - font.pixelSize: 18 + // anchors.right: parent.right + // anchors.rightMargin: 20 + font.pixelSize: 16 } } Button { id: button - x: 30 - y: 214 + y: 246 text: qsTr("Сохранить") - font.pointSize: 18 + anchors.left: parent.left + anchors.leftMargin: 130 + anchors.right: parent.right + anchors.rightMargin: 152 + font.pointSize: 16 } } diff --git a/installer.iss b/installer.iss index 044b27e..b0563f3 100644 --- a/installer.iss +++ b/installer.iss @@ -2,9 +2,9 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "CallMyPhone" -#define MyAppVersion "0.5" -#define MyAppPublisher "My Company, Inc." -#define MyAppURL "http://www.example.com/" +#define MyAppVersion "0.6" +#define MyAppPublisher "Batmanov Konstantin" +#define MyAppURL "https://github.com/Konstantin2/CallMyPhone" #define MyAppExeName "CallMyPhone.exe" [Setup] @@ -24,7 +24,7 @@ DisableDirPage=yes DefaultGroupName={#MyAppName} DisableProgramGroupPage=yes OutputDir=C:\Users\k.batmanov\Documents\build-CallMyPhone-Desktop_Qt_5_11_0_MinGW_32bit-Release\installer -OutputBaseFilename=setup_callmyphone +OutputBaseFilename=setup_callmyphone_v{#MyAppVersion} Compression=lzma SolidCompression=yes PrivilegesRequired=lowest diff --git a/main.qml b/main.qml index 7ae5b4e..cc1437d 100644 --- a/main.qml +++ b/main.qml @@ -2,39 +2,90 @@ import QtQuick 2.9 import QtQuick.Controls 2.2 import Qt.labs.settings 1.0 - ApplicationWindow { + id: mainApplication visible: true -// width: 640 -// height: 480 - width: 580 - height: 100 -// maximumHeight: 480 -// maximumWidth: 640 - maximumHeight: 100 - maximumWidth: 580 + width: 640 + height: 480 + maximumWidth: 640 + maximumHeight: 480 title: qsTr("Набор номера") + Settings { + id: settings + category: 'main' + property string phone_url: 'http://127.0.0.1'; + property string phone_user: 'admin'; + property string phone_passwd: 'password'; + property string outgoing_uri: 'admin@127.0.0.1'; + + property string lastcalls: "{}" + property string contacts: "{}" + + property bool full_mode_switch: false + + } + + function change_window_mode(mode) { + if (mode === true){ + mainApplication.maximumHeight = 480; + mainApplication.maximumWidth = 640; + mainApplication.height = 480; + mainApplication.width = 640; + settings.full_mode_switch = true + } else { + mainApplication.maximumHeight = 70; + mainApplication.maximumWidth = 640; + mainApplication.height = 70; + mainApplication.width = 640; + settings.full_mode_switch = false + } + } + + function clear_number(number){ //Удаляет лишние символы из номера + return number.replace(/[^0-9\+\*\#a-zA-Z\_]/g, '') || ""; //Оставляем только нужные символы + } + Component.onCompleted: { //Выполняется после старта приложения + // switch1.checked = settings_window.full_mode_switch; + change_window_mode(settings.full_mode_switch); -// try { -// //Загружаем посление звонки -// var datamodel = JSON.parse(settings.lastcalls) -// var i; -// lastcalls1.listModel.clear(); -// for (i = 0; i < datamodel.length; ++i) lastcalls1.listModel.append(datamodel[i]) -// } catch (err) { -// } + var i; // try { // //Загружаем контакты -// datamodel = JSON.parse(settings.contacts) +// var datamodel_contacts = JSON.parse(settings.contacts) // contacts1.listModel.clear(); -// for (i = 0; i < datamodel.length; ++i) contacts1.listModel.append(datamodel[i]) +// for (i = 0; i < datamodel_contacts.length; ++i) contacts1.listModel.append(datamodel_contacts[i]) // } catch (err) { // } +// function get_name(contacts, number){ +// for (var i = 0; i < contacts.length; ++i){ + +// if ((clear_number(contacts[i].number) === clear_number(number))&& contacts[i].name !== "Не указан"){ +// return contacts[i].name; +// } +// } +// return ""; +// } + + try { + //Загружаем посление звонки + var datamodel_lastcalls = JSON.parse(settings.lastcalls) + lastcalls1.listModel.clear(); + for (i = 0; i < datamodel_lastcalls.length; ++i){ + +// datamodel_lastcalls[i].name = get_name(datamodel_contacts, datamodel_lastcalls[i].number) || datamodel_lastcalls[i].name; + + lastcalls1.listModel.append(datamodel_lastcalls[i]) + } + } catch (err) { + } + + + phonenumber.text = get_cmd_phonenumber(); //Загружаем вызываемый номер phonenumber.phone_name = get_cmd_phonename() || qsTr("Не указан"); //Загружаем ФИО вызываемого номер если указано @@ -65,22 +116,10 @@ ApplicationWindow { // Qt.application.arguments[argIndex] //access items in argv // Qt.application.arguments.length //gives argc - Settings { - id: settings - category: 'main' - property string phone_url: 'http://127.0.0.1'; - property string phone_user: 'admin'; - property string phone_passwd: 'password'; - property string outgoing_uri: 'admin@127.0.0.1'; - - property string lastcalls: "{}" - property string contacts: "{}" - - } function call_number(number, out_uri){ -// var only_number = number.replace(/[^0-9\+\*\#]/g, '') || ""; //Оставляем только нужные символы, а если вызывают по sip логину? - Нельзя так удалять! - var only_number = number.replace(/[ \(\)\-]/g, '') || ""; //Удаляем лишние символы + var only_number = clear_number(number); //Оставляем только нужные символы +// var only_number = number.replace(/[ \(\)\-]/g, '') || ""; //Удаляем лишние символы if (only_number !== "") { var request = new XMLHttpRequest(); @@ -123,6 +162,7 @@ ApplicationWindow { if (phonenumber.text !== get_cmd_phonenumber()){ phonenumber.phone_name = qsTr("Не указан"); + param.name = qsTr("Не указан"); } // lastcalls1.listModel.append(param) @@ -154,6 +194,8 @@ ApplicationWindow { return dd + '.' + mm + '.' + yyyy + ' ' + hh + ':' + MM; } + + header: Item { Row { @@ -179,11 +221,11 @@ ApplicationWindow { onClicked: { call_number(phonenumber.text, settings.outgoing_uri); -// add_lastcall({ -// "number": phonenumber.text, -// "name" : phonenumber.phone_name, -// "date" : formatDate(new Date()) -// }) + add_lastcall({ + "number": phonenumber.text, + "name" : phonenumber.phone_name, + "date" : formatDate(new Date()) + }) } } @@ -195,44 +237,61 @@ ApplicationWindow { onClicked: send_key('Cancel') } - } + Switch { + id: switch1 + // anchors.top: call_stop.bottom +// x: 117 +// y: 282 + text: qsTr("Дополнительно") + checked: settings.full_mode_switch + onClicked: { + change_window_mode(this.checked); + } + + } + + } + } -// SwipeView{ -// id: swipeView -// anchors.fill: parent -// currentIndex: tabBar.currentIndex + SwipeView{ + id: swipeView + anchors.fill: parent + visible: settings.full_mode_switch + currentIndex: tabBar.currentIndex -// Lastcalls{ -// id: lastcalls1 + Lastcalls{ + id: lastcalls1 -// } + } // Contacts{ // id: contacts1 // } -// Options{ -// id: options1 -// } + Options{ + id: options1 + } -// } + } -// footer: TabBar{ -// id: tabBar -// currentIndex: swipeView.currentIndex -// font.pixelSize: 20 + footer: TabBar{ + id: tabBar + currentIndex: swipeView.currentIndex + visible: settings.full_mode_switch -// TabButton{ -// text: qsTr("Вызовы") -// } + font.pixelSize: 20 + + TabButton{ + text: qsTr("Вызовы") + } // TabButton{ // text: qsTr("Контакты") // } -// TabButton{ -// text: qsTr("Настройки") -// } -// } + TabButton{ + text: qsTr("Настройки") + } + } } diff --git a/release/setup_callmyphone_v0.6.exe b/release/setup_callmyphone_v0.6.exe new file mode 100644 index 0000000..cab80a5 Binary files /dev/null and b/release/setup_callmyphone_v0.6.exe differ