diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-22 19:59:10 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-08-22 20:01:56 +0200 |
| commit | c832aae70e55f5f97f5f9093735f493cd29cd9b9 (patch) | |
| tree | 2be58f58f2f2fd4a277ceaa15b48d98de74d27d0 | |
| parent | ca089c7e204a6dec7fc3ee2c83fc0aefbafaecfa (diff) | |
updater: get the updater GUI working on Linux
Change-Id: I3e7edb5319ab2e2ec316204b917a7e29c1791b5b
| -rw-r--r-- | Repository.mk | 5 | ||||
| -rw-r--r-- | onlineupdate/Executable_updater.mk | 1 | ||||
| -rw-r--r-- | onlineupdate/Module_onlineupdate.mk | 2 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/progressui_gtk.cxx | 6 | ||||
| -rw-r--r-- | onlineupdate/workben/test_dialog.cxx | 7 |
5 files changed, 14 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk index 736e13370503..623e956bd282 100644 --- a/Repository.mk +++ b/Repository.mk @@ -57,9 +57,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svg2odf \ svidl \ $(if $(ENABLE_ONLINE_UPDATE_MAR),\ - $(if $(filter WNT,$(OS)), \ - test_updater_dialog \ - )) \ + test_updater_dialog \ + ) \ treex \ ulfex \ unoidl-read \ diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index a717f2f8aa3c..a4ceacee6bc1 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -80,7 +80,6 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\ onlineupdate/source/update/updater/archivereader \ onlineupdate/source/update/updater/bspatch \ onlineupdate/source/update/updater/progressui_gtk \ - onlineupdate/source/update/updater/progressui_null \ onlineupdate/source/update/updater/updater \ $(if $(filter WNT,$(OS)),\ onlineupdate/source/update/updater/loaddlls \ diff --git a/onlineupdate/Module_onlineupdate.mk b/onlineupdate/Module_onlineupdate.mk index a343506e351d..58e1d3de4531 100644 --- a/onlineupdate/Module_onlineupdate.mk +++ b/onlineupdate/Module_onlineupdate.mk @@ -17,8 +17,8 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\ StaticLibrary_updatehelper \ $(if $(filter WNT,$(OS)),\ Executable_update_service \ - Executable_test_updater_dialog \ WinResTarget_updater )\ + Executable_test_updater_dialog \ Executable_mar \ Executable_updater \ Executable_mbsdiff \ diff --git a/onlineupdate/source/update/updater/progressui_gtk.cxx b/onlineupdate/source/update/updater/progressui_gtk.cxx index fecd98a8730a..595a29ad68cf 100644 --- a/onlineupdate/source/update/updater/progressui_gtk.cxx +++ b/onlineupdate/source/update/updater/progressui_gtk.cxx @@ -11,6 +11,7 @@ #include "progressui.h" #include "readstrings.h" #include "errors.h" +#include <string.h> #define TIMER_INTERVAL 100 @@ -76,7 +77,10 @@ ShowProgressUI() StringTable strings; if (ReadStrings(ini_path, &strings) != OK) - return -1; + { + strcpy(strings.title, "LibreOffice Updater"); + strcpy(strings.info, "This program is updating your LibreOffice installation."); + } sWin = gtk_window_new(GTK_WINDOW_TOPLEVEL); if (!sWin) diff --git a/onlineupdate/workben/test_dialog.cxx b/onlineupdate/workben/test_dialog.cxx index 113ec07eebbd..ba9f258df913 100644 --- a/onlineupdate/workben/test_dialog.cxx +++ b/onlineupdate/workben/test_dialog.cxx @@ -1,5 +1,10 @@ #include "progressui.h" + +#if defined(_WIN32) #include "progressui_win.cxx" +#else +#include "progressui_gtk.cxx" +#endif #include <thread> #include <chrono> @@ -15,7 +20,7 @@ void func() QuitProgressUI(); } -int wmain(int argc, wchar_t** argv) +int NS_main(int argc, NS_tchar** argv) { InitProgressUI(&argc, &argv); std::thread a(func); |