#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
+#include "hbversion.h"
#include "renderer_button.h"
#include "hb-backend.h"
#include "ghb-dvd.h"
#include "values.h"
#include "icons.h"
#include "callbacks.h"
+#include "x264handler.h"
#include "settings.h"
#include "resources.h"
#include "presets.h"
extern void queue_list_selection_changed_cb(void);
extern void queue_remove_clicked_cb(void);
extern void queue_list_size_allocate_cb(void);
+extern void queue_drag_cb(void);
+extern void queue_drag_motion_cb(void);
// Create and bind the tree model to the tree view for the queue list
// Also, connect up the signal that lets us know the selection has changed
GtkTreeStore *treestore;
GtkTreeView *treeview;
GtkTreeSelection *selection;
+ GtkTargetEntry SrcEntry;
+ SrcEntry.target = "DATA";
+ SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
g_debug("bind_queue_tree_model ()\n");
treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "queue_list"));
gtk_tree_view_column_set_min_width (column, 24);
gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+ gtk_tree_view_enable_model_drag_dest (treeview, &SrcEntry, 1,
+ GDK_ACTION_MOVE);
+ gtk_tree_view_enable_model_drag_source (treeview, GDK_BUTTON1_MASK,
+ &SrcEntry, 1, GDK_ACTION_MOVE);
+
g_signal_connect(selection, "changed", queue_list_selection_changed_cb, ud);
g_signal_connect(cell, "clicked", queue_remove_clicked_cb, ud);
- g_signal_connect(treeview, "size-allocate", queue_list_size_allocate_cb, textcell);
+ g_signal_connect(treeview, "size-allocate", queue_list_size_allocate_cb,
+ textcell);
+ g_signal_connect(treeview, "drag_data_received", queue_drag_cb, ud);
+ g_signal_connect(treeview, "drag_motion", queue_drag_motion_cb, ud);
+
+ // Work around silly treeview display bug. If the treeview
+ // hasn't been shown yet, the width request doesn't seem
+ // to work right. Cells get badly formatted.
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+ gtk_widget_show (widget);
+ gtk_widget_hide (widget);
}
extern void audio_list_selection_changed_cb(void);
}
extern void presets_list_selection_changed_cb(void);
+extern void presets_drag_cb(void);
+extern void presets_drag_motion_cb(void);
// Create and bind the tree model to the tree view for the preset list
// Also, connect up the signal that lets us know the selection has changed
{
GtkCellRenderer *cell;
GtkTreeViewColumn *column;
- GtkListStore *treestore;
+ GtkTreeStore *treestore;
GtkTreeView *treeview;
GtkTreeSelection *selection;
GtkWidget *widget;
+ GtkTargetEntry SrcEntry;
+ SrcEntry.target = "DATA";
+ SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
g_debug("bind_presets_tree_model ()\n");
treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "presets_list"));
selection = gtk_tree_view_get_selection (treeview);
- treestore = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT,
+ treestore = gtk_tree_store_new(5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT,
G_TYPE_STRING, G_TYPE_STRING);
gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell,
"text", 0, "weight", 1, "style", 2, "foreground", 3, NULL);
gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+ gtk_tree_view_column_set_expand (column, TRUE);
gtk_tree_view_set_tooltip_column (treeview, 4);
+
+ gtk_tree_view_enable_model_drag_dest (treeview, &SrcEntry, 1,
+ GDK_ACTION_MOVE);
+ gtk_tree_view_enable_model_drag_source (treeview, GDK_BUTTON1_MASK,
+ &SrcEntry, 1, GDK_ACTION_MOVE);
+
+ g_signal_connect(treeview, "drag_data_received", presets_drag_cb, ud);
+ g_signal_connect(treeview, "drag_motion", presets_drag_motion_cb, ud);
g_signal_connect(selection, "changed", presets_list_selection_changed_cb, ud);
widget = GHB_WIDGET (ud->builder, "presets_remove");
gtk_widget_set_sensitive(widget, FALSE);
{
GIOChannel *channel;
gint pfd[2];
+ gchar *config, *path;
// I'm opening a pipe and attaching the writer end to stderr
// The reader end will be polled by main event loop and I'll get
}
// Open activity log.
// TODO: Put this in the same directory as the encode destination
- ud->activity_log = g_io_channel_new_file ("Activity.log", "w", NULL);
+ config = ghb_get_user_config_dir(NULL);
+ path = g_strdup_printf("%s/%s", config, "Activity.log");
+ ud->activity_log = g_io_channel_new_file (path, "w", NULL);
+ ud->job_activity_log = NULL;
+ ghb_ui_update(ud, "activity_location", ghb_string_value(path));
+ g_free(path);
+ g_free(config);
// Set encoding to raw.
g_io_channel_set_encoding (ud->activity_log, NULL, NULL);
stderr->_fileno = pfd[1];
static gchar *dvd_device = NULL;
static gchar *arg_preset = NULL;
+static gboolean ghb_debug = FALSE;
static GOptionEntry entries[] =
{
{ "device", 'd', 0, G_OPTION_ARG_FILENAME, &dvd_device, "The device or file to encode", NULL },
{ "preset", 'p', 0, G_OPTION_ARG_STRING, &arg_preset, "The preset values to use for encoding", NULL },
+ { "debug", 'x', 0, G_OPTION_ARG_NONE, &ghb_debug, "Spam a lot", NULL },
{ NULL }
};
{
GtkWidget *window;
signal_user_data_t *ud;
- gchar *preset;
+ GValue *preset;
GError *error = NULL;
GOptionContext *context;
gtk_set_locale ();
gtk_init (&argc, &argv);
+ ghb_register_transforms();
ghb_resource_init();
ghb_load_icons();
ghb_hal_init();
#endif
- ud = g_malloc(sizeof(signal_user_data_t));
- ud->debug = FALSE;
- ud->cancel_encode = FALSE;
+ ud = g_malloc0(sizeof(signal_user_data_t));
+ ud->debug = ghb_debug;
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
ud->settings = ghb_settings_new();
- ud->queue = NULL;
- ud->current_job = NULL;
- ud->current_dvd_device = NULL;
- ud->dont_clear_presets = FALSE;
- // Redirect stderr to the activity window
- IoRedirect(ud);
// Enable events that alert us to media change events
watch_volumes (ud);
ud->builder = create_builder_or_die (BUILDER_NAME);
+ // Redirect stderr to the activity window
+ IoRedirect(ud);
+ ghb_log("Handbrake Version: %s (%d)", HB_VERSION, HB_BUILD);
ghb_init_dep_map();
// Need to connect x264_options textview buffer to the changed signal
// since it can't be done automatically
GtkTextView *textview;
GtkTextBuffer *buffer;
- textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264_options"));
+ textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264Option"));
buffer = gtk_text_view_get_buffer (textview);
g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
}
gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
GtkWidget *widget;
- widget = GHB_WIDGET(ud->builder, "deinterlace");
+ widget = GHB_WIDGET(ud->builder, "PictureDeinterlace");
tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "tweak_deinterlace");
+ widget = GHB_WIDGET(ud->builder, "tweak_PictureDeinterlace");
!tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "denoise");
+ widget = GHB_WIDGET(ud->builder, "PictureDenoise");
tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
- widget = GHB_WIDGET(ud->builder, "tweak_denoise");
+ widget = GHB_WIDGET(ud->builder, "tweak_PictureDenoise");
!tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
gchar *source = ghb_settings_get_string(ud->settings, "default_source");
ghb_x264_parse_options(ud, "");
// Populate the presets tree view
- ghb_presets_list_update(ud);
+ ghb_presets_list_init(ud, NULL, 0);
// Get the first preset name
if (arg_preset != NULL)
{
- ghb_select_preset(ud->builder, arg_preset);
+ preset = ghb_parse_preset_path(arg_preset);
+ if (preset)
+ {
+ ghb_select_preset(ud->builder, preset);
+ ghb_value_free(preset);
+ }
}
else
{
- preset = ghb_settings_get_string (ud->settings, "default_preset");
- ghb_select_preset(ud->builder, preset);
- g_free(preset);
+ ghb_select_default_preset(ud->builder);
}
// Grey out widgets that are dependent on a disabled feature
}
// Reload and check status of the last saved queue
g_idle_add((GSourceFunc)ghb_reload_queue, ud);
+ g_idle_add((GSourceFunc)ghb_check_update, ud);
// Start timer for monitoring libhb status, 500ms
g_timeout_add (500, ghb_timer_cb, (gpointer)ud);
// Everything should be go-to-go. Lets rock!
OSDN Git Service
