Merge branch 'master' of ssh.marcbarbier.fr:Marc/modmanager into interface

CMakeLists.txt

@@ -33,6 +33,7 @@ set(SOURCES
 	src/fomod/group.c
 	src/fomod/xmlUtil.c
 	src/fomod/parser.c
+	src/gui/guiMain.c
 )
 
 # add the executable
@@ -42,13 +43,18 @@ find_package(PkgConfig REQUIRED)
 pkg_search_module(GLIB REQUIRED glib-2.0)
 pkg_search_module(AUDIT REQUIRED audit)
 pkg_search_module(LIBXML REQUIRED libxml-2.0)
+pkg_search_module(GTK REQUIRED gtk4)
 
-target_include_directories(mod-manager PRIVATE ${GLIB_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} ${AUDIT_INCLUDE_DIRS})
+target_include_directories(mod-manager PRIVATE ${GLIB_INCLUDE_DIRS})
+target_include_directories(mod-manager PRIVATE ${LIBXML_INCLUDE_DIRS})
+target_include_directories(mod-manager PRIVATE ${AUDIT_INCLUDE_DIRS})
+target_include_directories(mod-manager PRIVATE ${GTK_INCLUDE_DIRS})
 
 
 target_link_libraries(mod-manager ${GLIB_LDFLAGS})
 target_link_libraries(mod-manager ${LIBXML_LIBRARIES})
 target_link_libraries(mod-manager ${AUDIT_LIBRARIES})
+target_link_libraries(mod-manager ${GTK_LIBRARIES})
 
 install(TARGETS mod-manager DESTINATION bin)
 

src/gui/guiMain.c

@@ -0,0 +1,46 @@
+#include "guiMain.h"
+#include "../steam.h"
+
+#include <gtk/gtk.h>
+
+static void print_hello(GtkWidget *widget, gpointer data) {
+  g_print("Hello World\n");
+}
+
+static void activate(GtkApplication *app, gpointer user_data) {
+  GtkWidget *window;
+  GtkWidget *button;
+  GtkWidget *box;
+
+  window = gtk_application_window_new(app);
+  gtk_window_set_title(GTK_WINDOW(window), "Mod Manager");
+  gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
+
+  box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+  gtk_widget_set_halign(box, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign(box, GTK_ALIGN_CENTER);
+
+  gtk_window_set_child(GTK_WINDOW(window), box);
+
+  button = gtk_button_new_with_label("Hello World");
+
+  g_signal_connect(button, "clicked", G_CALLBACK(print_hello), NULL);
+  g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_window_destroy), window);
+
+  gtk_box_append(GTK_BOX(box), button);
+
+  gtk_widget_show(window);
+}
+
+int guiMain(int argc, char **argv) {
+
+  GtkApplication *app;
+  int status;
+
+  app = gtk_application_new("fr.marcbarbier.modmanager", G_APPLICATION_DEFAULT_FLAGS);
+  g_signal_connect(app, "activate", G_CALLBACK(activate), NULL);
+  status = g_application_run(G_APPLICATION(app), 1, argv);
+  g_object_unref(app);
+
+  return status;
+}

src/gui/guiMain.h

@@ -0,0 +1,6 @@
+#ifndef __GUIMAIN_H__
+#define __GUIMAIN_H__
+
+int guiMain(int argc, char **argv);
+
+#endif

src/main.c

@@ -19,6 +19,9 @@
 #include "fomod.h"
 #include "order.h"
 
+#include "gui/guiMain.h"
+
+GHashTable * gamePaths;
 #define ENABLED_COLOR "\033[0;32m"
 #define DISABLED_COLOR "\033[0;31m"
 
@@ -665,6 +668,9 @@ int main(int argc, char ** argv) {
 	else if(strcmp(argv[1], "--remove") == 0 || strcmp(argv[1], "-r") == 0)
 		returnValue = removeMod(argc, argv);
 
+	else if(strcmp(argv[1], "--gui") == 0)
+		returnValue = guiMain(argc, argv);
+
 	else if(strcmp(argv[1], "--swap") == 0 || strcmp(argv[1], "-s") == 0)
 		returnValue = swapMod(argc, argv);
 

src/steam.h

@@ -32,6 +32,7 @@ static const u_int32_t GAMES_APPIDS[] = {
 	489830,
 	22330,
 	377160,
+	72850,
 	22320
 };
 
@@ -40,6 +41,7 @@ static const char * GAMES_NAMES[] = {
 	"Skyrim Special Edition",
 	"Oblivion",
 	"Fallout 4",
+	"Skyrim",
 	"Morrowind"
 };