Skip to content

Commit 5b2ca0d

Browse files
committed
GDrive setup changes
1 parent f7db5ad commit 5b2ca0d

26 files changed

+64
-133
lines changed
-965 KB
Binary file not shown.

Advanced Installer/Advanced Installer.aip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
<ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.png" Type="1" MsiKey="BannerBitmap"/>
4242
<ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialogbitmap.png" Type="1" MsiKey="DialogBitmap"/>
4343
<ROW Property="Manufacturer" Value="Albert MN."/>
44-
<ROW Property="ProductCode" Value="1033:{2280A735-687B-4D3D-9313-02E3041F56A6} " Type="16"/>
44+
<ROW Property="ProductCode" Value="1033:{9531A112-84A4-48EE-8DFC-3B76EA1B5EEF} " Type="16"/>
4545
<ROW Property="ProductLanguage" Value="1033"/>
4646
<ROW Property="ProductName" Value="AssistantComputerControl"/>
47-
<ROW Property="ProductVersion" Value="1.4.4" Type="32"/>
47+
<ROW Property="ProductVersion" Value="1.4.5" Type="32"/>
4848
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
4949
<ROW Property="UpgradeCode" Value="{8E6F4399-B513-420B-8E11-36837A8550EE}"/>
5050
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

AssistantComputerControl/AssistantComputerControl.csproj

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
3636
<WebPage>publish.htm</WebPage>
3737
<ApplicationRevision>0</ApplicationRevision>
38-
<ApplicationVersion>1.4.4.%2a</ApplicationVersion>
38+
<ApplicationVersion>1.4.5.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
4141
<PublishWizardCompleted>true</PublishWizardCompleted>
@@ -51,6 +51,7 @@
5151
<ErrorReport>prompt</ErrorReport>
5252
<WarningLevel>3</WarningLevel>
5353
<UseVSHostingProcess>false</UseVSHostingProcess>
54+
<Prefer32Bit>false</Prefer32Bit>
5455
</PropertyGroup>
5556
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5657
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -60,6 +61,7 @@
6061
<DefineConstants>TRACE</DefineConstants>
6162
<ErrorReport>prompt</ErrorReport>
6263
<WarningLevel>4</WarningLevel>
64+
<Prefer32Bit>false</Prefer32Bit>
6365
</PropertyGroup>
6466
<PropertyGroup>
6567
<StartupObject>AssistantComputerControl.MainProgram</StartupObject>
@@ -262,15 +264,7 @@
262264
<Content Include="WebFiles\ActionTester.html">
263265
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
264266
</Content>
265-
<Content Include="WebFiles\assets\images\acc_logo.png">
266-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
267-
</Content>
268-
<Content Include="WebFiles\assets\css\bootstrap.min.css">
269-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
270-
</Content>
271-
<Content Include="WebFiles\assets\js\bootstrap.min.js">
272-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
273-
</Content>
267+
<Content Include="WebFiles\assets\bootstrap.min.old.css" />
274268
<Content Include="WebFiles\assets\cloud_services\dropbox.png">
275269
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
276270
</Content>
@@ -283,9 +277,15 @@
283277
<Content Include="WebFiles\assets\cloud_services\onedrive.png">
284278
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
285279
</Content>
280+
<Content Include="WebFiles\assets\css\bootstrap.min.css">
281+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
282+
</Content>
286283
<Content Include="WebFiles\assets\css\getting_started_main.css">
287284
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
288285
</Content>
286+
<Content Include="WebFiles\assets\css\sweetalert2.min.css">
287+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
288+
</Content>
289289
<Content Include="WebFiles\assets\gifs\onedrive_howto.gif">
290290
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
291291
</Content>
@@ -295,6 +295,9 @@
295295
<Content Include="WebFiles\assets\gifs\sync_specific_folder.gif">
296296
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
297297
</Content>
298+
<Content Include="WebFiles\assets\images\acc_logo.png">
299+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
300+
</Content>
298301
<Content Include="WebFiles\assets\images\ifttt_logo.png">
299302
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
300303
</Content>
@@ -304,16 +307,16 @@
304307
<Content Include="WebFiles\assets\images\voice-icon.png">
305308
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
306309
</Content>
307-
<Content Include="WebFiles\assets\js\jquery.js">
310+
<Content Include="WebFiles\assets\js\bootstrap.min.js">
308311
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
309312
</Content>
310313
<Content Include="WebFiles\assets\js\getting_started_scripts.js">
311314
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
312315
</Content>
313-
<Content Include="WebFiles\assets\js\popper.min.js">
316+
<Content Include="WebFiles\assets\js\jquery.js">
314317
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
315318
</Content>
316-
<Content Include="WebFiles\assets\css\sweetalert2.min.css">
319+
<Content Include="WebFiles\assets\js\popper.min.js">
317320
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
318321
</Content>
319322
<Content Include="WebFiles\assets\js\sweetalert2.min.js">

AssistantComputerControl/MainProgram.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
namespace AssistantComputerControl {
2929
class MainProgram {
30-
public const string softwareVersion = "1.4.4",
31-
releaseDate = "2021-05-19 20:59:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
30+
public const string softwareVersion = "1.4.5",
31+
releaseDate = "2021-10-11 01:24:00", //YYYY-MM-DD H:i:s - otherwise it gives an error
3232
appName = "AssistantComputerControl",
3333

34-
sentryToken = "super_secret";
34+
sentryToken = "https://[email protected]/1287269";
3535

3636
static public bool debug = true,
3737
unmuteVolumeChange = true,

AssistantComputerControl/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("1.4.4.0")]
37-
[assembly: AssemblyFileVersion("1.4.4.0")]
36+
[assembly: AssemblyVersion("1.4.5.0")]
37+
[assembly: AssemblyFileVersion("1.4.5.0")]
3838
[assembly: NeutralResourcesLanguage("en")]

AssistantComputerControl/Translations/Danish.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,12 @@
151151

152152
/* Google Drive specific */
153153
"make_google_account": "Du har sikkert allerede en Google konto - hvis ikke, <a href=\"https://accounts.google.com/signup/v2\">opret en</a>",
154-
"google_drive_download": "Download Google Drive til din computer, <a href=\"https://www.google.com/drive/download/\">vælg \"Private; Backup and Sync\"</a> <small>(hvis det ikke allerede er installeret)</small>",
154+
"google_drive_download": "Download <a href=\"https://www.google.com/drive/download/\">Google Drive</a> til din computer, <small>(hvis det ikke allerede er installeret)</small>",
155155
"google_drive_install": "Kør installationsprogrammet og færdiggør installationen",
156-
"google_drive_click_logo": "Klik på Google Drive \"Backup and sync\" logoet i proceslinjen",
156+
"google_drive_click_logo": "Klik på Google Drive logoet i proceslinjen",
157157
"google_drive_preferences": "Tryk på de tre prikker i højre hjørne og gå til <b>\"Preferences\"</b> <i>(indstillinger)</i>",
158158
"google_drive_sync": "Klik på <b>\"Google Drive\"</b> fanen og sikre dig at <b>\"Sync My Drive to this computer\"</b> er aktiv",
159159

160-
"google_drive_sync_all": "Vil du have alle dine Google Drive filer på computeren?",
161-
"google_drive_sync_all_desc": "Vælg \"Sync everything in My Drive (x GB)\"",
162-
"google_drive_acc_only_sync": "... eller <i>bare</i> for AssistantComputerControl's skyld?",
163-
"google_drive_website_goto": "Gå til Google Drive (i din browser)",
164-
"google_drive_create_folder": "I \"My drive\" fanen, højre-klik og lav en ny mappe",
165-
"google_drive_name_folder": "Navngiv mappen \"AssistantComputerControl\" <i>(vigtigt at det er stavet rigtigt)</i>",
166-
"google_drive_sync_specific_folders": "Vælg \"Sync these folders only...\", og un-tick alt undtagen mappen kaldet \"AssistantComputerControl\"",
167-
168160
/* IFTTT specific */
169161
"set_up_ifttt_acc": "Set din IFTTT konto op",
170162
"set_up_ifttt_extra": "Med AssistantComputerControl's applets",

AssistantComputerControl/Translations/Dutch.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,12 @@
148148

149149
/* Google Drive specific */
150150
"make_google_account": "Waarschijnlijk heeft u een Google account - Als dit niet het geval is, <a href=\"https://accounts.google.com/signup/v2\">Maak er één aan</a>",
151-
"google_drive_download": "Download Google Drive voor u computer <a href=\"https://www.google.com/drive/download/\">kies \"Private; Backup and Sync\"</a> <small>(Als je dit nog niet gedaan hebt)</small>",
151+
"google_drive_download": "Download Google Drive voor u computer <a href=\"https://www.google.com/drive/download/\">kies \"Download\"</a> <small>(Als je dit nog niet gedaan hebt)</small>",
152152
"google_drive_install": "voer de instalie uit en beëindig de instalatie",
153153
"google_drive_click_logo": "Klik op het \"Backup and sync\" logo in u taakbalk",
154154
"google_drive_preferences": "Druk op de 3 bolletjes in de rechter hoek, en ga naar <b>\"Voorkeuren of Preferences\"</b>",
155155
"google_drive_sync": "Ga naar de <b>\"Google Drive\"</b> tab en zorg ervoor dat <b>\"Synchroniseer My Drive met deze computer\"</b> is aangeduid",
156-
157-
"google_drive_sync_all": "Wil je al je Google Drive bestanden op je computer?",
158-
"google_drive_sync_all_desc": "Kies voor \"Alles in My Drive (x GB) synchroniseren\"",
159-
"google_drive_acc_only_sync": "... of <i>enkel</i> in het belang van AssistantComputerControl?",
160-
"google_drive_website_goto": "Ga naar u Google Drive (in je browser)",
161-
"google_drive_create_folder": "In de \"My drive\" tab, rechts-klik je bestanden sectie of druk op de \"My drive\" dropdown menu, en kies <b>\"Nieuwe map\"</b>",
162-
"google_drive_name_folder": "Benoem de map \"AssistantComputerControl\" <i>(het is belangrijk om geen schrijffouten te maken hierbij)</i>",
163-
"google_drive_sync_specific_folders": "Kies \"Synchroniseer enkel deze mappen...\", en duid enkel \"AssistantComputerControl\" aan",
156+
164157

165158
/* IFTTT specific */
166159
"set_up_ifttt_acc": "Registeer een IFTTT account",

AssistantComputerControl/Translations/English.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,6 @@
159159
"google_drive_preferences": "Press the three dots in the right corner, and go to <b>\"Preferences\"</b>",
160160
"google_drive_sync": "Go to the <b>\"Google Drive\"</b> tab and make sure <b>\"Sync My Drive to this computer\"</b> is ticked",
161161

162-
"google_drive_sync_all": "Want all your Google Drive files on your computer?",
163-
"google_drive_sync_all_desc": "Choose \"Sync everything in My Drive (x GB)\"",
164-
"google_drive_acc_only_sync": "... or <i>just</i> for the sake of AssistantComputerControl?",
165-
"google_drive_website_goto": "Go to your Google Drive (in your browser)",
166-
"google_drive_create_folder": "In the \"My drive\" tab, right-click the section files-section or press the \"My drive\" dropdown, and choose <b>\"New folder\"</b>",
167-
"google_drive_name_folder": "Name the folder \"AssistantComputerControl\" <i>(it's important that there are no typos here)</i>",
168-
"google_drive_sync_specific_folders": "Choose \"Sync these folders only...\", and un-tick everything but the folder called \"AssistantComputerControl\"",
169-
170162
/* IFTTT specific */
171163
"set_up_ifttt_acc": "Set up your IFTTT account",
172164
"set_up_ifttt_extra": "With the AssistantComputerControl applets",

AssistantComputerControl/Translations/Francais.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,12 @@
150150

151151
/* Google Drive specific */
152152
"make_google_account": "Vous devriez avoir un compte Google - sinon, <a href=\"https://accounts.google.com/signup/v2\">en créer un</a>",
153-
"google_drive_download": "Télécharger Google Drive pour votre ordinateur <a href=\"https://www.google.com/drive/download/\">choisir \"Personnel; Sauvegarde et Synchronisation\"</a> <small>(si vous ne l'avez pas déjà fait)</small>",
153+
"google_drive_download": "Télécharger Google Drive pour votre ordinateur <a href=\"https://www.google.com/drive/download/\">choisir \"Download\"</a> <small>(si vous ne l'avez pas déjà fait)</small>",
154154
"google_drive_install": "Installer le programme puis revenez ici",
155155
"google_drive_click_logo": "Cliquer sur le logo \"Sauvegarde et Synchronisation\" dans la barre des tâches",
156156
"google_drive_preferences": "Appuyer sur les 3 points dans le coin droit, puis dans <b>\"Préférences\"</b>",
157157
"google_drive_sync": "Aller dans l'onglet <b>\"Google Drive\"</b> et vérifier que <b>\"Synchroniser mon Drive sur cet ordinateur\"</b> est coché",
158158

159-
"google_drive_sync_all": "Voulez-vous tout votre Google Drive sur votre ordinateur ?",
160-
"google_drive_sync_all_desc": "Choisir \"Synchroniser tout dans mon Drive (x Go)\"",
161-
"google_drive_acc_only_sync": "... ou <i>juste</i> pour les besoins de AssistantComputerControl?",
162-
"google_drive_website_goto": "Aller dans votre Google Drive (via votre navigateur)",
163-
"google_drive_create_folder": "Dans l'onglet \"Mon drive\" , faire un clic droit dans la zone des fichiers, et choisir <b>\"Nouveau dossier\"</b>",
164-
"google_drive_name_folder": "Nommer le dossier \"AssistantComputerControl\" <i>(c'est très important de respecter la typo)</i>",
165-
"google_drive_sync_specific_folders": "Choisir \"Synchroniser ces dossiers uniquement...\", et décocher tout sauf le dossier \"AssistantComputerControl\"",
166-
167159
/* IFTTT specific */
168160
"set_up_ifttt_acc": "Configurer votre compte IFTTT",
169161
"set_up_ifttt_extra": "avec les applets AssistantComputerControl",

AssistantComputerControl/Translations/Italian.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,12 @@
143143

144144
/* Google Drive specific */
145145
"make_google_account": "Molto probabilmente hai già un account Google - in caso contrario, <a href=\"https://accounts.google.com/signup/v2\">creane uno</a>",
146-
"google_drive_download": "Scarica Google Drive per il tuo computer <a href=\"https://www.google.com/drive/download/\">seleziona \"Personale; Backup e sincronizzazione\"</a> <small>(se non lo hai già)</small>",
146+
"google_drive_download": "Scarica Google Drive per il tuo computer <a href=\"https://www.google.com/drive/download/\">seleziona \"Download\"</a> <small>(se non lo hai già)</small>",
147147
"google_drive_install": "Avvia l'installer e completa l'installazione",
148148
"google_drive_click_logo": "Clicca sul logo \"Backup e sincronizzazione di Google\" sulla barra delle applicazioni",
149149
"google_drive_preferences": "Premi i tre pallini sulla destra, e seleziona <b>\"Preferenze\"</b>",
150150
"google_drive_sync": "Vai sulla sezione <b>\"Google Drive\"</b> e accertati che <b>\"Sincronizza il mio Drive su questo computer\"</b> sia selezionato",
151151

152-
"google_drive_sync_all": "Vuoi tutti i tuoi file di Google Drive sul tuo computer?",
153-
"google_drive_sync_all_desc": "Seleziona \"Sincronizza tutto il mio Drive (x GB)\"",
154-
"google_drive_acc_only_sync": "... oppure vuoi sincronizzare <i>solo</i> AssistantComputerControl?",
155-
"google_drive_website_goto": "Vai sul tuo Google Drive (dal tuo browser)",
156-
"google_drive_create_folder": "Nella scheda \"Il mio Drive\" a lato, fai clic col tasto destro del mouse o premi il menu a discesa da \"Il mio Drive\" in alto e scegli <b>\"Nuova cartella\"</b>",
157-
"google_drive_name_folder": "Chiama la cartella \"AssistantComputerControl\" <i>(è importante che non siano inseriti altri tipi di caratteri)</i>",
158-
"google_drive_sync_specific_folders": "Seleziona \"Sincronizza solo queste cartelle...\", e deseleziona tutto tranne la cartella \"AssistantComputerControl\"",
159-
160152
/* IFTTT specific */
161153
"set_up_ifttt_acc": "Configura il tuo account IFTTT",
162154
"set_up_ifttt_extra": "Con gli applet di AssistantComputerControl",

0 commit comments

Comments
 (0)