summaryrefslogtreecommitdiffstats
path: root/gtk/src/main.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2008-09-06 16:48:54 +0000
committerjstebbins <[email protected]>2008-09-06 16:48:54 +0000
commit88b4851b757a6276f4b717127a5463005b6a868f (patch)
treec52e671d57ec6b3a40e5f7b2ede8e800ca33e795 /gtk/src/main.c
parent6d9a7854ec8143ac4b45b66eb2a32e357ba6cacb (diff)
LinGui: Add queue save/restore
- 2 instances of libhb are used. One for queue activities and one for scanning new sources prior to adding to the queue. - Improve chapter entry usability. In addition to "return" advancing to the next chapter for editing, up and down arrows will advance to prev/next and put the cell in edit mode. - Add an accelerator key to jump to the destination entry box. - Fix a queue window resize problem. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1668 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/main.c')
-rw-r--r--gtk/src/main.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/gtk/src/main.c b/gtk/src/main.c
index cc5c20a2e..6cf76ae1c 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -38,6 +38,7 @@
#include "renderer_button.h"
#include "hb-backend.h"
#include "ghb-dvd.h"
+#include "ghbcellrenderertext.h"
/*
@@ -219,6 +220,7 @@ change_font(GtkWidget *widget, gpointer data)
extern void chapter_list_selection_changed_cb(void);
extern void chapter_edited_cb(void);
+extern void chapter_keypress_cb(void);
// Create and bind the tree model to the tree view for the chapter list
// Also, connect up the signal that lets us know the selection has changed
@@ -237,17 +239,18 @@ bind_chapter_tree_model (signal_user_data_t *ud)
treestore = gtk_list_store_new(3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_BOOLEAN);
gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
- cell = gtk_cell_renderer_text_new();
+ cell = ghb_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
_("Chapter No."), cell, "text", 0, NULL);
gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- cell = gtk_cell_renderer_text_new();
+ cell = ghb_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(
_("Chapter Title"), cell, "text", 1, "editable", 2, NULL);
gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
- g_signal_connect(cell, "edited", chapter_edited_cb, ud);
+ g_signal_connect(cell, "key-press-event", chapter_keypress_cb, ud);
+ g_signal_connect(cell, "edited", chapter_edited_cb, ud);
g_signal_connect(selection, "changed", chapter_list_selection_changed_cb, ud);
g_debug("Done\n");
}
@@ -504,9 +507,11 @@ main (int argc, char *argv[])
ud = g_malloc(sizeof(signal_user_data_t));
ud->debug = FALSE;
+ ud->cancel_encode = FALSE;
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;
// Redirect stderr to the activity window
IoRedirect(ud);
@@ -600,6 +605,8 @@ main (int argc, char *argv[])
// Source overridden from command line option
ghb_settings_set_string(ud->settings, "source", dvd_device);
}
+ // Reload and check status of the last saved queue
+ g_idle_add((GSourceFunc)ghb_reload_queue, 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!