markus/mdiary
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Revert "Trying some app_menu stuff"

Browse Source 
This reverts commit 844813709b.
This commit is contained in:
Markus Koch 2017-02-18 15:06:11 +01:00
parent 6c462332be
commit 2c4f0c273a
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.c
View File

@ -10,31 +10,17 @@ int main(int argc, char *argv[])
struct mainWindow *mainWindow; struct mainWindow *mainWindow;
struct mdiary_settings *settings; struct mdiary_settings *settings;
gchar *settings_path; gchar *settings_path;
GtkApplication *app;
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
mainWindow = mainWindow_new(); mainWindow = mainWindow_new();
app = gtk_application_new(0, G_APPLICATION_FLAGS_NONE);
g_application_register(app, NULL, NULL);
gtk_application_add_window(app, mainWindow->mainWindow);
GMenu *app_menu = g_menu_new();
GMenu *p1 = g_menu_new();
GMenu *p2 = g_menu_new();
g_menu_append(p1, "Settings", "win.settings");
g_menu_append(p2, "Quit", "win.quit");
g_menu_append_section(app_menu, NULL, p1);
g_menu_append_section(app_menu, NULL, p2);
gtk_application_set_app_menu(app, G_MENU_MODEL(app_menu));
settings_path = g_strdup_printf("%s/.mdiary.conf", g_get_home_dir()); settings_path = g_strdup_printf("%s/.mdiary.conf", g_get_home_dir());
settings = mdiary_settings_new(mainWindow); settings = mdiary_settings_new(mainWindow);
mdiary_load_settings(settings_path, settings); mdiary_load_settings(settings_path, settings);
gtk_widget_show(mainWindow->mainWindow); gtk_widget_show(mainWindow->mainWindow);
/* gtk_main(); */ gtk_main();
g_application_run(G_APPLICATION(app), argc, argv);
mdiary_save_settings(settings_path, settings); mdiary_save_settings(settings_path, settings);
mdiary_settings_free(settings); mdiary_settings_free(settings);