Skip to content

Commit f8b6e16

Browse files
unalignedcoderunalignedcoder
committed
Added a progress bar for time-consuming imports; Several minor fixes;
1 parent d63ae71 commit f8b6e16

4 files changed

Lines changed: 93 additions & 74 deletions

File tree

‎CalibreImport/Locales.cs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public static class Locales
3737
{ "Error", "Error" },
3838
{ "SettingsSaved", "Settings saved succesfully." },
3939
{ "ImportForm", "Calibre Import" },
40-
{ "SelectLanguage", "Select language:" },
4140
{ "SelectLibrary", "Select Calibre library" },
4241
{ "PleaseSelectLibrary", "Please select a library." },
4342
{ "Save", "Save" },
44-
{ "Cancel", "Cancel" }
45-
}
43+
{ "Cancel", "Cancel" },
44+
{ "SelectLanguage", "Select language:" }
45+
}
4646
},
4747
{
4848
"fr-FR", new Dictionary<string, string>
@@ -75,12 +75,12 @@ public static class Locales
7575
{ "Error", "Erreur" },
7676
{ "SettingsSaved", "Paramètres enregistrés avec succès." },
7777
{ "ImportForm", "Importation Calibre" },
78-
{ "SelectLanguage", "Sélectionner la langue:" },
7978
{ "SelectLibrary", "Sélectionnez la bibliothèque Calibre" },
8079
{ "PleaseSelectLibrary", "Veuillez sélectionner une bibliothèque" },
8180
{ "Save", "Enregistrer" },
82-
{ "Cancel", "Annuler" }
83-
}
81+
{ "Cancel", "Annuler" },
82+
{ "SelectLanguage", "Sélectionner la langue:" }
83+
}
8484
},
8585
{
8686
"cs-CZ", new Dictionary<string, string>
@@ -169,7 +169,6 @@ public static class Locales
169169
{ "ImportFailure", "Error al importar archivos. Verifique el registro para más detalles." },
170170
{ "ImportBtn", "Importar" },
171171
{ "Importing", "Importando..." },
172-
{ "SelectLanguages", "Seleccionar idioma:" },
173172
{ "InvalidFiles", "Selección de archivos no válida" },
174173
{ "CalibreProcessesRunning", "Los siguientes procesos relacionados con Calibre están en ejecución y serán terminados:" },
175174
{ "DoYouWantToProceed", "¿Quieres proceder?" },
@@ -193,7 +192,7 @@ public static class Locales
193192
{ "PleaseSelectLibrary", "Por favor seleccione una biblioteca." },
194193
{ "Save", "Guardar" },
195194
{ "Cancel", "Cancelar" },
196-
{ "SelectLanguages", "Seleccionar idioma:" }
195+
{ "SelectLanguage", "Seleccionar idioma:" }
197196
}
198197
},
199198
{ "it", new Dictionary<string, string>
@@ -230,7 +229,7 @@ public static class Locales
230229
{ "PleaseSelectLibrary", "Seleziona una libreria." },
231230
{ "Save", "Salva" },
232231
{ "Cancel", "Annulla" },
233-
{ "SelectLanguages", "Seleziona lingua:" }
232+
{ "SelectLanguage", "Seleziona lingua:" }
234233
}
235234
},
236235
{ "ja", new Dictionary<string, string>
@@ -267,7 +266,7 @@ public static class Locales
267266
{ "PleaseSelectLibrary", "ライブラリを選択してください。" },
268267
{ "Save", "保存" },
269268
{ "Cancel", "キャンセル" },
270-
{ "SelectLanguages", "言語を選択:" }
269+
{ "SelectLanguage", "言語を選択:" }
271270
}
272271
},
273272
{
@@ -343,7 +342,7 @@ public static class Locales
343342
{ "PleaseSelectLibrary", "Por favor, selecione uma biblioteca." },
344343
{ "Save", "Salvar" },
345344
{ "Cancel", "Cancelar" },
346-
{ "SelectLanguages", "Selecionar idioma:" }
345+
{ "SelectLanguage", "Selecionar idioma:" }
347346
}
348347
},
349348
{
@@ -381,7 +380,7 @@ public static class Locales
381380
{ "PleaseSelectLibrary", "Пожалуйста, выберите библиотеку." },
382381
{ "Save", "Сохранить" },
383382
{ "Cancel", "Отмена" },
384-
{ "SelectLanguages", "Выберите язык:" }
383+
{ "SelectLanguage", "Выберите язык:" }
385384
}
386385
},
387386
{
@@ -419,7 +418,7 @@ public static class Locales
419418
{ "PleaseSelectLibrary", "Lütfen bir kütüphane seçin." },
420419
{ "Save", "Kaydet" },
421420
{ "Cancel", "İptal" },
422-
{ "SelectLanguages", "Dili seçin:" }
421+
{ "SelectLanguage", "Dili seçin:" }
423422
}
424423
},
425424
{
@@ -457,7 +456,7 @@ public static class Locales
457456
{ "PleaseSelectLibrary", "请选择一个库。" },
458457
{ "Save", "保存" },
459458
{ "Cancel", "取消" },
460-
{ "SelectLanguages", "选择语言" }
459+
{ "SelectLanguage", "选择语言" }
461460
}
462461
}
463462
};

‎CalibreImport/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("1.0.3.9")]
33-
[assembly: AssemblyFileVersion("1.0.3.9")]
32+
[assembly: AssemblyVersion("1.0.4.0")]
33+
[assembly: AssemblyFileVersion("1.0.4.0")]

‎CalibreImport/ReleaseFiles/CalibreImport.dll‎

1.5 KB
Binary file not shown.

‎CalibreImport/ResourceStrings.cs‎

Lines changed: 78 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,103 @@
1+
using System;
12
using System.Globalization;
23

34
namespace CalibreImport
45
{
56
public static class ResourceStrings
67
{
7-
public static string NameAppRes;
8-
public static string MenuTextRes;
9-
public static string InvalidSelectionRes;
10-
public static string SettingsRes;
8+
public static string AlsoDebugLogRes;
9+
public static string CalibreProcessesRunningRes;
10+
public static string CalibreRunning2Res;
1111
public static string CalibreRunningRes;
12-
public static string ImportSuccessRes;
13-
public static string ImportFailureRes;
12+
public static string CancelRes;
13+
public static string DoYouWantToProceedRes;
14+
public static string DuplicatesWhatRes;
15+
public static string ErrorLaunchingRes;
16+
public static string ErrorRes;
17+
public static string HideLibrariesRes;
1418
public static string ImportBtnRes;
19+
public static string ImportFailureRes;
20+
public static string ImportFormRes;
1521
public static string ImportingRes;
22+
public static string ImportSuccessRes;
1623
public static string InvalidFilesRes;
17-
public static string CalibreProcessesRunningRes;
18-
public static string DoYouWantToProceedRes;
19-
public static string CalibreRunning2Res;
20-
public static string ErrorLaunchingRes;
21-
public static string UseSubmenuRes;
22-
public static string LogEbooksRes;
23-
public static string AlsoDebugLogRes;
24+
public static string InvalidSelectionRes;
2425
public static string KillCalibreRes;
25-
public static string HideLibrariesRes;
26-
public static string SetEntryNameRes;
27-
public static string PathToCalibreRes;
28-
public static string DuplicatesWhatRes;
26+
public static string LogEbooksRes;
27+
public static string MenuTextRes;
28+
public static string NameAppRes;
2929
public static string NameSettingsFormRes;
30-
public static string RegistrationFailedRes;
3130
public static string NoLibrariesRes;
32-
public static string ErrorRes;
33-
public static string SettingsSavedRes;
34-
public static string ImportFormRes;
35-
public static string SelectLanguageRes;
36-
public static string SelectLibraryRes;
31+
public static string PathToCalibreRes;
3732
public static string PleaseSelectLibraryRes;
33+
public static string RegistrationFailedRes;
3834
public static string SaveRes;
39-
public static string CancelRes;
35+
public static string SelectLanguageRes;
36+
public static string SelectLibraryRes;
37+
public static string SetEntryNameRes;
38+
public static string SettingsRes;
39+
public static string SettingsSavedRes;
40+
public static string UseSubmenuRes;
4041

4142
static ResourceStrings()
4243
{
43-
LoadResourceStrings();
44+
try
45+
{
46+
LoadResourceStrings();
47+
}
48+
catch (Exception ex)
49+
{
50+
// Log the exception and rethrow
51+
Logger.LogThis($"Error initializing ResourceStrings: {ex.Message}", true);
52+
throw;
53+
}
4454
}
4555

4656
public static void LoadResourceStrings()
4757
{
48-
NameAppRes = Locales.GetString("NameApp");
49-
MenuTextRes = Locales.GetString("MenuText");
50-
InvalidSelectionRes = Locales.GetString("InvalidSelection");
51-
SettingsRes = Locales.GetString("Settings");
52-
CalibreRunningRes = Locales.GetString("CalibreRunning");
53-
ImportBtnRes = Locales.GetString("Import");
54-
ImportSuccessRes = Locales.GetString("ImportSuccess");
55-
ImportFailureRes = Locales.GetString("ImportFailure");
56-
InvalidFilesRes = Locales.GetString("InvalidFiles");
57-
ImportingRes = Locales.GetString("Importing");
58-
CalibreProcessesRunningRes = Locales.GetString("CalibreProcessesRunning");
59-
DoYouWantToProceedRes = Locales.GetString("DoYouWantToProceed");
60-
CalibreRunning2Res = Locales.GetString("CalibreRunning2");
61-
ErrorLaunchingRes = Locales.GetString("ErrorLaunching");
62-
UseSubmenuRes = Locales.GetString("UseSubmenu");
63-
LogEbooksRes = Locales.GetString("LogEbooks");
64-
AlsoDebugLogRes = Locales.GetString("AlsoDebugLog");
65-
KillCalibreRes = Locales.GetString("KillCalibre");
66-
HideLibrariesRes = Locales.GetString("HideLibraries");
67-
SetEntryNameRes = Locales.GetString("SetEntryName");
68-
PathToCalibreRes = Locales.GetString("PathToCalibre");
69-
DuplicatesWhatRes = Locales.GetString("DuplicatesWhat");
70-
NameSettingsFormRes = Locales.GetString("NameSettingsForm");
71-
RegistrationFailedRes = Locales.GetString("RegistrationFailed");
72-
NoLibrariesRes = Locales.GetString("NoLibraries");
73-
ErrorRes = Locales.GetString("Error");
74-
SettingsSavedRes = Locales.GetString("SettingsSaved");
75-
ImportFormRes = Locales.GetString("ImportForm");
76-
SelectLanguageRes = Locales.GetString("SelectLanguage");
77-
SelectLibraryRes = Locales.GetString("SelectLibrary");
78-
PleaseSelectLibraryRes = Locales.GetString("PleaseSelectLibrary");
79-
SaveRes = Locales.GetString("Save");
80-
CancelRes = Locales.GetString("Cancel");
58+
try
59+
{
60+
AlsoDebugLogRes = Locales.GetString("AlsoDebugLog");
61+
CalibreProcessesRunningRes = Locales.GetString("CalibreProcessesRunning");
62+
CalibreRunning2Res = Locales.GetString("CalibreRunning2");
63+
CalibreRunningRes = Locales.GetString("CalibreRunning");
64+
CancelRes = Locales.GetString("Cancel");
65+
DoYouWantToProceedRes = Locales.GetString("DoYouWantToProceed");
66+
DuplicatesWhatRes = Locales.GetString("DuplicatesWhat");
67+
ErrorLaunchingRes = Locales.GetString("ErrorLaunching");
68+
ErrorRes = Locales.GetString("Error");
69+
HideLibrariesRes = Locales.GetString("HideLibraries");
70+
ImportBtnRes = Locales.GetString("ImportBtn");
71+
ImportFailureRes = Locales.GetString("ImportFailure");
72+
ImportFormRes = Locales.GetString("ImportForm");
73+
ImportingRes = Locales.GetString("Importing");
74+
ImportSuccessRes = Locales.GetString("ImportSuccess");
75+
InvalidFilesRes = Locales.GetString("InvalidFiles");
76+
InvalidSelectionRes = Locales.GetString("InvalidSelection");
77+
KillCalibreRes = Locales.GetString("KillCalibre");
78+
LogEbooksRes = Locales.GetString("LogEbooks");
79+
MenuTextRes = Locales.GetString("MenuText");
80+
NameAppRes = Locales.GetString("NameApp");
81+
NameSettingsFormRes = Locales.GetString("NameSettingsForm");
82+
NoLibrariesRes = Locales.GetString("NoLibraries");
83+
PathToCalibreRes = Locales.GetString("PathToCalibre");
84+
PleaseSelectLibraryRes = Locales.GetString("PleaseSelectLibrary");
85+
RegistrationFailedRes = Locales.GetString("RegistrationFailed");
86+
SaveRes = Locales.GetString("Save");
87+
SelectLanguageRes = Locales.GetString("SelectLanguage");
88+
SelectLibraryRes = Locales.GetString("SelectLibrary");
89+
SetEntryNameRes = Locales.GetString("SetEntryName");
90+
SettingsRes = Locales.GetString("Settings");
91+
SettingsSavedRes = Locales.GetString("SettingsSaved");
92+
UseSubmenuRes = Locales.GetString("UseSubmenu");
93+
}
94+
95+
catch (Exception ex)
96+
{
97+
// Log the exception and rethrow
98+
Logger.LogThis($"Error loading resource strings: {ex.Message}", true);
99+
throw;
100+
}
81101
}
82102
}
83103
}

0 commit comments

Comments
 (0)