LinGui: first cut at anamorphic picture settings enhancements

[handbrake-jp/handbrake-jp-git.git] / gtk / src / main.c

diff --git a/gtk/src/main.c b/gtk/src/main.c
index 4c7952f..76097cb 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -50,6 +50,7 @@
 #include "resources.h"
 #include "presets.h"
 #include "preview.h"
+#include "ghbcompositor.h"
 
 
 /*
@@ -83,18 +84,20 @@ create_builder_or_die(const gchar * name)
 {
        guint res = 0;
        GValue *gval;
+       GError *error = NULL;
        const gchar *ghb_ui;
 
     const gchar *markup =
         N_("<b><big>Unable to create %s.</big></b>\n"
         "\n"
-        "Internal error. Could not parse UI description.\n");
+        "Internal error. Could not parse UI description.\n"
+               "%s");
        g_debug("create_builder_or_die ()\n");
        GtkBuilder *xml = gtk_builder_new();
        gval = ghb_resource_get("ghb-ui");
        ghb_ui = g_value_get_string(gval);
        if (xml != NULL)
-               res = gtk_builder_add_from_string(xml, ghb_ui, -1, NULL);
+               res = gtk_builder_add_from_string(xml, ghb_ui, -1, &error);
     if (!xml || !res) 
        {
         GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL,
@@ -102,7 +105,7 @@ create_builder_or_die(const gchar * name)
             GTK_MESSAGE_ERROR,
             GTK_BUTTONS_CLOSE,
             _(markup),
-            name);
+            name, error->message);
         gtk_dialog_run(GTK_DIALOG(dialog));
         gtk_widget_destroy(dialog);
         exit(EXIT_FAILURE);
@@ -494,11 +497,40 @@ extern int mm_flags;
 int mm_support();
 
 void x264_entry_changed_cb(GtkWidget *widget, signal_user_data_t *ud);
+void preview_window_expose_cb(void);
+
+// Some style definitions for the preview window and hud
+const gchar *hud_rcstyle =
+"style \"ghb-entry\" {\n"
+"GtkEntry::inner-border = {2,2,1,1}\n"
+"}\n"
+"style \"ghb-combo\" {\n"
+"xthickness = 1\n"
+"ythickness = 1\n"
+"}\n"
+"style \"ghb-preview\" {\n"
+"bg[NORMAL]=\"black\"\n"
+"}\n"
+"style \"ghb-hud\" {\n"
+"bg[NORMAL]=\"gray18\"\n"
+"bg[ACTIVE]=\"gray32\"\n"
+"bg[PRELIGHT]=\"gray46\"\n"
+"bg[SELECTED]=\"black\"\n"
+"base[NORMAL]=\"gray40\"\n"
+"text[NORMAL]=\"white\"\n"
+"text[ACTIVE]=\"white\"\n"
+"fg[NORMAL]=\"white\"\n"
+"fg[ACTIVE]=\"white\"\n"
+"fg[PRELIGHT]=\"white\"\n"
+"}\n"
+"widget_class \"*.GtkComboBox.GtkToggleButton\" style \"ghb-combo\"\n"
+"widget_class \"*.GtkEntry\" style \"ghb-entry\"\n"
+"widget \"preview_window.*.preview_hud.*\" style \"ghb-hud\"\n"
+"widget \"preview_window\" style \"ghb-preview\"\n";
 
 int
 main (int argc, char *argv[])
 {
-       GtkWidget *window;
        signal_user_data_t *ud;
        GValue *preset;
        GError *error = NULL;
@@ -522,6 +554,7 @@ main (int argc, char *argv[])
        
        gtk_set_locale ();
        gtk_init (&argc, &argv);
+       gtk_rc_parse_string(hud_rcstyle);
        notify_init("HandBrake");
        ghb_register_transforms();
        ghb_resource_init();
@@ -540,11 +573,30 @@ main (int argc, char *argv[])
        // Enable events that alert us to media change events
        watch_volumes (ud);
        ud->builder = create_builder_or_die (BUILDER_NAME);
+
+       //GtkWidget *widget = GHB_WIDGET(ud->builder, "PictureDetelecineCustom");
+       //gtk_entry_set_inner_border(widget, 2);
+
+       // Set up the "hud" control overlay for the preview window
+       GtkWidget *draw, *hud, *blender, *align;
+
+       align = GHB_WIDGET(ud->builder, "preview_window_alignment");
+       draw = GHB_WIDGET(ud->builder, "preview_image");
+       hud = GHB_WIDGET(ud->builder, "preview_hud");
+
+       // Set up compositing for hud
+       blender = ghb_compositor_new();
+
+       gtk_container_add(GTK_CONTAINER(align), blender);
+       ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), draw, 1, 1);
+       ghb_compositor_zlist_insert(GHB_COMPOSITOR(blender), hud, 2, .85);
+       gtk_widget_show(blender);
+
        // Redirect stderr to the activity window
        ghb_preview_init(ud);
        IoRedirect(ud);
-    ghb_log( "%s - %s - %s",
-             HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
+       ghb_log( "%s - %s - %s",
+               HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
        ghb_init_dep_map();
 
        // Need to connect x264_options textview buffer to the changed signal
@@ -576,10 +628,6 @@ main (int argc, char *argv[])
        ghb_presets_load();
        ghb_prefs_load(ud);
 
-       // Start the show.
-       window = GHB_WIDGET (ud->builder, "hb_window");
-       gtk_widget_show (window);
-
        ghb_prefs_to_ui(ud);
 
        gint logLevel;
@@ -632,27 +680,6 @@ main (int argc, char *argv[])
        g_timeout_add (500, ghb_timer_cb, (gpointer)ud);
        // Everything should be go-to-go.  Lets rock!
 
-       // Create floating window over preview image
-       GtkWidget *widget;
-       GdkWindow *parent, *win;
-
-       widget = GHB_WIDGET(ud->builder, "preview_image");
-       gtk_widget_realize(widget);
-       //parent = gtk_widget_get_window(widget);
-       parent = widget->window;
-       widget = GHB_WIDGET(ud->builder, "preview_hud");
-       gtk_widget_realize(widget);
-       //win = gtk_widget_get_window(widget);
-       win = widget->window;
-       gdk_window_reparent(win, parent, 0, 0);
-
-/*
-       if (ghb_settings_get_boolean(ud->settings, "preview_fullscreen"))
-       {
-               gtk_window_set_resizable(window, TRUE);
-               gtk_window_fullscreen(window);
-       }
-*/
        gtk_main ();
        ghb_backend_close();
        if (ud->queue)