summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-05-15 14:59:37 +0000
committerjstebbins <[email protected]>2014-05-15 14:59:37 +0000
commit0eeac2d4a98ff021c61bce7c45e4b0b9fc479efd (patch)
tree6e73a66cc6cf800d3421ad6c1c0d0fd2b923b089 /gtk
parent9ac66c0b787847fae383671ec1533e099cde7999 (diff)
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
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/callbacks.c4
-rw-r--r--gtk/src/ghb.ui327
-rw-r--r--gtk/src/main.c2
-rw-r--r--gtk/src/x264handler.c5
4 files changed, 50 insertions, 288 deletions
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.</p
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment67">
+ <object class="GtkStackSwitcher" id="SettingsStackSwitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
+ <property name="stack">SettingsStack</property>
+ <property name="hexpand">False</property>
+ <property name="halign">GTK_ALIGN_CENTER</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="SettingsStackAlign">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="margin-left">12</property>
+ <property name="margin-right">12</property>
<child>
- <object class="GtkNotebook" id="SettingsNotebook">
+ <object class="GtkStack" id="SettingsStack">
+ <property name="homogeneous">True</property>
+ <property name="transition-type">GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT_RIGHT</property>
+ <property name="transition-duration">400</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
@@ -2082,15 +2102,9 @@ This allows a player to initiate playback before downloading the entire file.</p
</packing>
</child>
</object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="picture_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Summary</property>
- </object>
<packing>
- <property name="tab_fill">False</property>
+ <property name="name">picture_tab</property>
+ <property name="title" translatable="yes">Summary</property>
</packing>
</child>
<child>
@@ -2757,17 +2771,8 @@ Colon separated list of x264 options.</property>
</object>
<packing>
<property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label65">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Video</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
+ <property name="name">video_tab</property>
+ <property name="title" translatable="yes">Video</property>
</packing>
</child>
<child>
@@ -3294,17 +3299,8 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is
</object>
<packing>
<property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="audio_defaults_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Audio Defaults</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
+ <property name="name">audio_defaults_tab</property>
+ <property name="title" translatable="yes">Audio Defaults</property>
</packing>
</child>
<child>
@@ -3424,17 +3420,8 @@ This permits DTS-HD passthru to be selected when automatic passthru selection is
</object>
<packing>
<property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label48">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Audio List</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
+ <property name="name">audio_list_tab</property>
+ <property name="title" translatable="yes">Audio List</property>
</packing>
</child>
<child>
@@ -3692,17 +3679,8 @@ This search pass finds short sequences of foreign audio and provides subtitles f
</object>
<packing>
<property name="position">4</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="subtitle_defaults_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Subtitle Defaults</property>
- </object>
- <packing>
- <property name="position">4</property>
- <property name="tab_fill">False</property>
+ <property name="name">subtitle_defaults_tab</property>
+ <property name="title" translatable="yes">Subtitle Defaults</property>
</packing>
</child>
<child>
@@ -3822,17 +3800,8 @@ This search pass finds short sequences of foreign audio and provides subtitles f
</object>
<packing>
<property name="position">5</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Subtitle List</property>
- </object>
- <packing>
- <property name="position">5</property>
- <property name="tab_fill">False</property>
+ <property name="name">subtitle_list_tab</property>
+ <property name="title" translatable="yes">Subtitle List</property>
</packing>
</child>
<child>
@@ -4905,17 +4874,8 @@ You can edit these and add additional options.</property>
</object>
<packing>
<property name="position">6</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="advanced_tab_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Advanced</property>
- </object>
- <packing>
- <property name="position">6</property>
- <property name="tab_fill">False</property>
+ <property name="name">video_advanced_tab</property>
+ <property name="title" translatable="yes">Advanced Video</property>
</packing>
</child>
<child>
@@ -4986,18 +4946,8 @@ You can edit these and add additional options.</property>
</object>
<packing>
<property name="position">7</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="chapters_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Chapters</property>
- </object>
- <packing>
- <property name="position">7</property>
- <property name="tab_fill">False</property>
+ <property name="name">chapters_tab</property>
+ <property name="title" translatable="yes">Chapters</property>
</packing>
</child>
<child>
@@ -5320,18 +5270,8 @@ You can edit these and add additional options.</property>
</object>
<packing>
<property name="position">8</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="metadata_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Tags</property>
- </object>
- <packing>
- <property name="position">8</property>
- <property name="tab_fill">False</property>
+ <property name="name">metadata_tab</property>
+ <property name="title" translatable="yes">Tags</property>
</packing>
</child>
</object>
@@ -5340,7 +5280,7 @@ You can edit these and add additional options.</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -5392,7 +5332,7 @@ You can edit these and add additional options.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -5414,7 +5354,7 @@ You can edit these and add additional options.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
@@ -7663,183 +7603,6 @@ Resets all queue jobs to pending and ready to run again.</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkSpinButton" id="PictureLeftCrop">
<property name="visible">True</property>
<property name="can_focus">True</property>
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);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 01:40:21 +0000