From: jstebbins Date: Thu, 15 May 2014 14:59:37 +0000 (+0000) Subject: LinGui: change main page GtkNotebook to GtkStack X-Git-Tag: 0.10.0~338 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0eeac2d4a98ff021c61bce7c45e4b0b9fc479efd;p=handbrake LinGui: change main page GtkNotebook to GtkStack GtkStack's allow animation effects. So now pages slide-in/slide-out :D git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6193 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index 46200f0a2..48dedce3c 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -3950,7 +3950,9 @@ ghb_hbfd(signal_user_data_t *ud, gboolean hbfd) gtk_widget_set_visible(widget, !hbfd); widget = GHB_WIDGET(ud->builder, "container_box"); gtk_widget_set_visible(widget, !hbfd); - widget = GHB_WIDGET(ud->builder, "SettingsNotebook"); + widget = GHB_WIDGET(ud->builder, "SettingsStackSwitcher"); + gtk_widget_set_visible(widget, !hbfd); + widget = GHB_WIDGET(ud->builder, "SettingsStackAlign"); gtk_widget_set_visible(widget, !hbfd); widget = GHB_WIDGET(ud->builder, "presets_save"); gtk_widget_set_visible(widget, !hbfd); diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index e1a9fc3d2..5f9625fff 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -1532,14 +1532,34 @@ This allows a player to initiate playback before downloading the entire file.

- + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - 12 + SettingsStack + False + GTK_ALIGN_CENTER + 12 + 12 + + + False + False + 1 + + + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 + 12 - + + True + GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT + 400 True True @@ -2082,15 +2102,9 @@ This allows a player to initiate playback before downloading the entire file.

 - - - - True - False - Summary - - False + picture_tab + Summary @@ -2757,17 +2771,8 @@ Colon separated list of x264 options. 1 - - - - - True - False - Video - - - 1 - False + video_tab + Video @@ -3294,17 +3299,8 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is 2 - - - - - True - False - Audio Defaults - - - 2 - False + audio_defaults_tab + Audio Defaults @@ -3424,17 +3420,8 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is 3 - - - - - True - False - Audio List - - - 3 - False + audio_list_tab + Audio List @@ -3692,17 +3679,8 @@ This search pass finds short sequences of foreign audio and provides subtitles f 4 - - - - - True - False - Subtitle Defaults - - - 4 - False + subtitle_defaults_tab + Subtitle Defaults @@ -3822,17 +3800,8 @@ This search pass finds short sequences of foreign audio and provides subtitles f 5 - - - - - True - False - Subtitle List - - - 5 - False + subtitle_list_tab + Subtitle List @@ -4905,17 +4874,8 @@ You can edit these and add additional options. 6 - - - - - True - False - Advanced - - - 6 - False + video_advanced_tab + Advanced Video @@ -4986,18 +4946,8 @@ You can edit these and add additional options. 7 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Chapters - - - 7 - False + chapters_tab + Chapters @@ -5320,18 +5270,8 @@ You can edit these and add additional options. 8 - - - - - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Tags - - - 8 - False + metadata_tab + Tags @@ -5340,7 +5280,7 @@ You can edit these and add additional options. True True - 1 + 2 @@ -5392,7 +5332,7 @@ You can edit these and add additional options. False True - 2 + 3 @@ -5414,7 +5354,7 @@ You can edit these and add additional options. False True - 3 + 4 @@ -7662,183 +7602,6 @@ Resets all queue jobs to pending and ready to run again. True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True diff --git a/gtk/src/main.c b/gtk/src/main.c index b07a917c1..e324f2063 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -1089,7 +1089,7 @@ main(int argc, char *argv[]) gint width, height; GdkGeometry geo = { - -1, -1, 1024, 768, -1, -1, 10, 10, 0, 0, GDK_GRAVITY_NORTH_WEST + -1, -1, 1920, 768, -1, -1, 10, 10, 0, 0, GDK_GRAVITY_NORTH_WEST }; GdkWindowHints geo_mask; geo_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE; diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c index 09b15613b..2db791173 100644 --- a/gtk/src/x264handler.c +++ b/gtk/src/x264handler.c @@ -38,12 +38,9 @@ void ghb_show_hide_advanced_video( signal_user_data_t *ud ) } GtkWidget *widget; - GtkWidget *nb = GHB_WIDGET(ud->builder, "SettingsNotebook"); GtkWidget *at = GHB_WIDGET(ud->builder, "advanced_tab"); - int pgn = gtk_notebook_page_num(GTK_NOTEBOOK(nb), at); - widget = gtk_notebook_get_nth_page(GTK_NOTEBOOK(nb), pgn); - gtk_widget_set_visible(widget, !hide); + gtk_widget_set_visible(at, !hide); widget = GHB_WIDGET(ud->builder, "x264UseAdvancedOptions"); gtk_widget_set_visible(widget, !hide); }