return TRUE;
}
+static void
+set_visible(GtkWidget *widget, gboolean visible)
+{
+ if (visible)
+ {
+ gtk_widget_show_now(widget);
+ }
+ else
+ {
+ gtk_widget_hide(widget);
+ }
+}
+
void
show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
- gtk_widget_show (widget);
+ set_visible(widget, gtk_toggle_tool_button_get_active(
+ GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+}
+
+void
+show_activity_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+ set_visible(widget, TRUE);
+ widget = GHB_WIDGET (ud->builder, "show_activity");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+}
+
+gboolean
+activity_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
+{
+ set_visible(xwidget, FALSE);
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "show_activity");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+ return TRUE;
}
void
show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
- gtk_widget_show (widget);
+ set_visible(widget, gtk_toggle_tool_button_get_active(
+ GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+}
+
+void
+show_queue_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+ set_visible(widget, TRUE);
+ widget = GHB_WIDGET (ud->builder, "show_queue");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+}
+
+gboolean
+queue_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
+{
+ set_visible(xwidget, FALSE);
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "show_queue");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+ return TRUE;
}
void
}
}
-static void
-set_visible(GtkWidget *widget, gboolean visible)
-{
- if (visible)
- {
- gtk_widget_show_now(widget);
- }
- else
- {
- gtk_widget_hide(widget);
- }
-}
-
void
ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
{
set_visible(widget, !hbfd);
widget = GHB_WIDGET(ud->builder, "presets_remove");
set_visible(widget, !hbfd);
- widget = GHB_WIDGET(ud->builder, "presets_default");
- set_visible(widget, !hbfd);
widget = GHB_WIDGET (ud->builder, "hb_window");
gtk_window_resize(GTK_WINDOW(widget), 16, 16);
<property name="icon-name">hb-picture</property>
<property name="name">show_preview_menu</property>
<property name="label" translatable="yes">_Picture Settings</property>
- <signal handler="preview_button_clicked_cb" name="activate"/>
+ <signal handler="preview_menu_clicked_cb" name="activate"/>
</object>
</child>
<child>
<property name="icon-name">hb-activity</property>
<property name="name">show_activity_menu</property>
<property name="label" translatable="yes">_Activity Window</property>
- <signal handler="show_activity_clicked_cb" name="activate"/>
+ <signal handler="show_activity_menu_clicked_cb" name="activate"/>
</object>
</child>
<child>
<property name="icon-name">hb-queue</property>
<property name="name">show_queue_menu</property>
<property name="label" translatable="yes">Show _Queue</property>
- <signal handler="show_queue_clicked_cb" name="activate"/>
+ <signal handler="show_queue_menu_clicked_cb" name="activate"/>
</object>
</child>
<child>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="show_queue">
+ <object class="GtkToggleToolButton" id="show_queue">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Show Queue</property>
<property name="label" translatable="yes">Show Queue</property>
<property name="icon_name">hb-queue</property>
- <signal handler="show_queue_clicked_cb" name="clicked"/>
+ <signal handler="show_queue_clicked_cb" name="toggled"/>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="show_picture">
+ <object class="GtkToggleToolButton" id="show_picture">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Open Picture Settings</property>
<property name="label" translatable="yes">Picture Settings</property>
<property name="icon_name">hb-picture</property>
- <signal name="clicked" handler="preview_button_clicked_cb"/>
+ <signal name="toggled" handler="preview_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="show_activity">
+ <object class="GtkToggleToolButton" id="show_activity">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Show Activity Window</property>
<property name="label" translatable="yes">Activity Window</property>
<property name="icon_name">hb-activity</property>
- <signal handler="show_activity_clicked_cb" name="clicked"/>
+ <signal handler="show_activity_clicked_cb" name="toggled"/>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkTable" id="container_box">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="activity_window_delete_cb" name="delete_event"/>
<child>
<object class="GtkVBox" id="vbox37">
<property name="visible">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="queue_window_delete_cb" name="delete_event"/>
<child>
<object class="GtkVBox" id="vbox34">
<property name="visible">True</property>
ghb_set_preview_image(ud);
}
+static void
+set_visible(GtkWidget *widget, gboolean visible)
+{
+ if (visible)
+ {
+ gtk_widget_show_now(widget);
+ }
+ else
+ {
+ gtk_widget_hide(widget);
+ }
+}
+
void
preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
{
- gint titleindex;
-
- titleindex = ghb_settings_combo_int(ud->settings, "title");
- if (titleindex < 0) return;
- g_debug("titleindex %d", titleindex);
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "preview_window");
+ set_visible(widget, gtk_toggle_tool_button_get_active(
+ GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+}
+void
+preview_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
GtkWidget *widget = GHB_WIDGET (ud->builder, "preview_window");
- gtk_widget_show (widget);
+ set_visible(widget, TRUE);
+ widget = GHB_WIDGET (ud->builder, "show_picture");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
}
void
{
live_preview_stop(ud);
gtk_widget_hide(widget);
+ widget = GHB_WIDGET (ud->builder, "show_picture");
+ gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
return TRUE;
}
"/property>\n"
" <property name="label" translatable="yes&"
"quot;>_Picture Settings</property>\n"
-" <signal handler="preview_button_clicked_cb" na"
-"me="activate"/>\n"
+" <signal handler="preview_menu_clicked_cb" name"
+"="activate"/>\n"
" </object>\n"
" </child>\n"
" <child>\n"
";/property>\n"
" <property name="label" translatable="yes&"
"quot;>_Activity Window</property>\n"
-" <signal handler="show_activity_clicked_cb" nam"
-"e="activate"/>\n"
+" <signal handler="show_activity_menu_clicked_cb""
+"; name="activate"/>\n"
" </object>\n"
" </child>\n"
" <child>\n"
"roperty>\n"
" <property name="label" translatable="yes&"
"quot;>Show _Queue</property>\n"
-" <signal handler="show_queue_clicked_cb" name=&"
-"quot;activate"/>\n"
+" <signal handler="show_queue_menu_clicked_cb" n"
+"ame="activate"/>\n"
" </object>\n"
" </child>\n"
" <child>\n"
" </packing>\n"
" </child>\n"
" <child>\n"
-" <object class="GtkToolButton" id="show_"
-"queue">\n"
+" <object class="GtkToggleToolButton" id=""
+";show_queue">\n"
" <property name="visible">True</prope"
"rty>\n"
" <property name="events">GDK_POINTER_MOT"
" <property name="icon_name">hb-queue<"
"/property>\n"
" <signal handler="show_queue_clicked_cb" na"
-"me="clicked"/>\n"
+"me="toggled"/>\n"
" </object>\n"
" <packing>\n"
" <property name="expand">False</prope"
" </packing>\n"
" </child>\n"
" <child>\n"
-" <object class="GtkToolButton" id="show_"
-"picture">\n"
+" <object class="GtkToggleToolButton" id=""
+";show_picture">\n"
" <property name="visible">True</prope"
"rty>\n"
" <property name="events">GDK_POINTER_MOT"
"yes">Picture Settings</property>\n"
" <property name="icon_name">hb-picture&l"
"t;/property>\n"
-" <signal name="clicked" handler="previ"
+" <signal name="toggled" handler="previ"
"ew_button_clicked_cb"/>\n"
" </object>\n"
" <packing>\n"
" </packing>\n"
" </child>\n"
" <child>\n"
-" <object class="GtkToolButton" id="show_"
-"activity">\n"
+" <object class="GtkToggleToolButton" id=""
+";show_activity">\n"
" <property name="visible">True</prope"
"rty>\n"
" <property name="events">GDK_POINTER_MOT"
" <property name="icon_name">hb-activity&"
"lt;/property>\n"
" <signal handler="show_activity_clicked_cb""
-" name="clicked"/>\n"
+" name="toggled"/>\n"
" </object>\n"
" <packing>\n"
" <property name="expand">False</prope"
" </child>\n"
" <child>\n"
" <object class="GtkTable" id="
-""table1">\n"
+""container_box">\n"
" <property name="visible"&g"
"t;True</property>\n"
" <property name="n_rows">"
"y>\n"
" <property name="skip_pager_hint">True</property&"
"gt;\n"
-" <signal handler="gtk_widget_hide_on_delete" name=""
+" <signal handler="activity_window_delete_cb" name=""
";delete_event"/>\n"
" <child>\n"
" <object class="GtkVBox" id="vbox37">\n"
"y>\n"
" <property name="skip_pager_hint">True</property&"
"gt;\n"
-" <signal handler="gtk_widget_hide_on_delete" name=""
-";delete_event"/>\n"
+" <signal handler="queue_window_delete_cb" name="de"
+"lete_event"/>\n"
" <child>\n"
" <object class="GtkVBox" id="vbox34">\n"
" <property name="visible">True</property>\n"
<property name="icon-name">hb-picture</property>
<property name="name">show_preview_menu</property>
<property name="label" translatable="yes">_Picture Settings</property>
- <signal handler="preview_button_clicked_cb" name="activate"/>
+ <signal handler="preview_menu_clicked_cb" name="activate"/>
</object>
</child>
<child>
<property name="icon-name">hb-activity</property>
<property name="name">show_activity_menu</property>
<property name="label" translatable="yes">_Activity Window</property>
- <signal handler="show_activity_clicked_cb" name="activate"/>
+ <signal handler="show_activity_menu_clicked_cb" name="activate"/>
</object>
</child>
<child>
<property name="icon-name">hb-queue</property>
<property name="name">show_queue_menu</property>
<property name="label" translatable="yes">Show _Queue</property>
- <signal handler="show_queue_clicked_cb" name="activate"/>
+ <signal handler="show_queue_menu_clicked_cb" name="activate"/>
</object>
</child>
<child>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="show_queue">
+ <object class="GtkToggleToolButton" id="show_queue">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Show Queue</property>
<property name="label" translatable="yes">Show Queue</property>
<property name="icon_name">hb-queue</property>
- <signal handler="show_queue_clicked_cb" name="clicked"/>
+ <signal handler="show_queue_clicked_cb" name="toggled"/>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="show_picture">
+ <object class="GtkToggleToolButton" id="show_picture">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Open Picture Settings</property>
<property name="label" translatable="yes">Picture Settings</property>
<property name="icon_name">hb-picture</property>
- <signal name="clicked" handler="preview_button_clicked_cb"/>
+ <signal name="toggled" handler="preview_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkToolButton" id="show_activity">
+ <object class="GtkToggleToolButton" id="show_activity">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="tooltip-text" translatable="yes">Show Activity Window</property>
<property name="label" translatable="yes">Activity Window</property>
<property name="icon_name">hb-activity</property>
- <signal handler="show_activity_clicked_cb" name="clicked"/>
+ <signal handler="show_activity_clicked_cb" name="toggled"/>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkTable" id="container_box">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="activity_window_delete_cb" name="delete_event"/>
<child>
<object class="GtkVBox" id="vbox37">
<property name="visible">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <signal handler="gtk_widget_hide_on_delete" name="delete_event"/>
+ <signal handler="queue_window_delete_cb" name="delete_event"/>
<child>
<object class="GtkVBox" id="vbox34">
<property name="visible">True</property>