Replace size-request by minimal height-for-width

[projects/chimara/chimara.git] / player / main.c

diff --git a/player/main.c b/player/main.c
index 8d797c37ff245879f7ec3e73e5cb64bab28e1b75..bd007b4ee128b0a7966822a37c547ca98c7b7c85 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -118,7 +118,13 @@ create_window(void)
        aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
        prefswindow = GTK_WIDGET(load_object("prefswindow"));
        GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
+
+       /* Set the default value of the "View/Toolbar" menu item upon creation of a
+        new window to the "show-toolbar-default" setting, but bind the setting
+        one-way only - we don't want toolbars to disappear suddenly */
        GtkToggleAction *toolbar_action = GTK_TOGGLE_ACTION(load_object("toolbar"));
+       gtk_toggle_action_set_active(toolbar_action, g_settings_get_boolean(state_settings, "show-toolbar-default"));
+       g_settings_bind(state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET);
 
        const gchar **ptr;
        GtkRecentFilter *filter = gtk_recent_filter_new();
@@ -164,24 +170,6 @@ create_window(void)
                }
 #endif /* DEBUG */
        }
-       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
-           CHIMARA_IF_FORMAT_Z5,
-           CHIMARA_IF_INTERPRETER_FROTZ);
-       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
-           CHIMARA_IF_FORMAT_Z6,
-           CHIMARA_IF_INTERPRETER_NITFOL);
-       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
-           CHIMARA_IF_FORMAT_Z8,
-           CHIMARA_IF_INTERPRETER_FROTZ);
-       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
-           CHIMARA_IF_FORMAT_Z_BLORB,
-           CHIMARA_IF_INTERPRETER_FROTZ);
-       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
-           CHIMARA_IF_FORMAT_GLULX,
-           CHIMARA_IF_INTERPRETER_GLULXE);
-       chimara_if_set_preferred_interpreter(CHIMARA_IF(glk),
-           CHIMARA_IF_FORMAT_GLULX_BLORB,
-           CHIMARA_IF_INTERPRETER_GLULXE);
        
        /* DON'T UNCOMMENT THIS your eyes will burn
         but it is a good test of programmatically altering just one style
@@ -204,6 +192,10 @@ create_window(void)
        else
                gtk_widget_hide(toolbar);
 
+       /* Connect the accelerators */
+       GtkAccelGroup *accels = gtk_ui_manager_get_accel_group(uimanager);
+       gtk_window_add_accel_group(GTK_WINDOW(window), accels);
+
        gtk_box_pack_end(vbox, glk, TRUE, TRUE, 0);
        gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
        gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);