mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updater: get the updater GUI working on Linux

Browse Source 
Change-Id: I3e7edb5319ab2e2ec316204b917a7e29c1791b5b
This commit is contained in:
Markus Mohrhard
2017-08-22 19:59:10 +02:00
parent ca089c7e20
commit c832aae70e
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Repository.mk
View File

@@ -57,9 +57,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svg2odf \ svg2odf \
svidl \ svidl \
$(if $(ENABLE_ONLINE_UPDATE_MAR),\ $(if $(ENABLE_ONLINE_UPDATE_MAR),\
$(if $(filter WNT,$(OS)), \ test_updater_dialog \
test_updater_dialog \ ) \
)) \
treex \ treex \
ulfex \ ulfex \
unoidl-read \ unoidl-read \

1
onlineupdate/Executable_updater.mk
View File

@@ -80,7 +80,6 @@ $(eval $(call gb_Executable_add_exception_objects,updater,\
onlineupdate/source/update/updater/archivereader \ onlineupdate/source/update/updater/archivereader \
onlineupdate/source/update/updater/bspatch \ onlineupdate/source/update/updater/bspatch \
onlineupdate/source/update/updater/progressui_gtk \ onlineupdate/source/update/updater/progressui_gtk \
onlineupdate/source/update/updater/progressui_null \
onlineupdate/source/update/updater/updater \ onlineupdate/source/update/updater/updater \
$(if $(filter WNT,$(OS)),\ $(if $(filter WNT,$(OS)),\
onlineupdate/source/update/updater/loaddlls \ onlineupdate/source/update/updater/loaddlls \

2
onlineupdate/Module_onlineupdate.mk
View File

@@ -17,8 +17,8 @@ $(eval $(call gb_Module_add_targets,onlineupdate,\
StaticLibrary_updatehelper \ StaticLibrary_updatehelper \
$(if $(filter WNT,$(OS)),\ $(if $(filter WNT,$(OS)),\
Executable_update_service \ Executable_update_service \
Executable_test_updater_dialog \
WinResTarget_updater )\ WinResTarget_updater )\
Executable_test_updater_dialog \
Executable_mar \ Executable_mar \
Executable_updater \ Executable_updater \
Executable_mbsdiff \ Executable_mbsdiff \

6
onlineupdate/source/update/updater/progressui_gtk.cxx
View File

@@ -11,6 +11,7 @@
#include "progressui.h" #include "progressui.h"
#include "readstrings.h" #include "readstrings.h"
#include "errors.h" #include "errors.h"
#include <string.h>
#define TIMER_INTERVAL 100 #define TIMER_INTERVAL 100
@@ -76,7 +77,10 @@ ShowProgressUI()
StringTable strings; StringTable strings;
if (ReadStrings(ini_path, &strings) != OK) 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); sWin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
if (!sWin) if (!sWin)

7
onlineupdate/workben/test_dialog.cxx
View File

@@ -1,5 +1,10 @@
#include "progressui.h" #include "progressui.h"
#if defined(_WIN32)
#include "progressui_win.cxx" #include "progressui_win.cxx"
#else
#include "progressui_gtk.cxx"
#endif
#include <thread> #include <thread>
#include <chrono> #include <chrono>
@@ -15,7 +20,7 @@ void func()
QuitProgressUI(); QuitProgressUI();
} }
int wmain(int argc, wchar_t** argv) int NS_main(int argc, NS_tchar** argv)
{ {
InitProgressUI(&argc, &argv); InitProgressUI(&argc, &argv);
std::thread a(func); std::thread a(func);