OSDN Git Service

(root) / handbrake-jp / handbrake-jp-git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f97a2e4)
LinGui: make the activity, queue, and picture tool bar buttons into toggles
authorjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 8 Jan 2009 22:44:02 +0000 (22:44 +0000)
committerjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Thu, 8 Jan 2009 22:44:02 +0000 (22:44 +0000)
pressing while the corresponding window is displayed hides the window.

git-svn-id: svn://localhost/HandBrake/trunk@2070 b64f7644-9d1e-0410-96f1-a4d463321fa5

gtk/src/callbacks.c patch | blob | history
gtk/src/ghb.ui patch | blob | history
gtk/src/preview.c patch | blob | history
gtk/src/resource_data.h patch | blob | history
gtk/src/resources.plist patch | blob | history

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 74b982e..9944033 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1972,11 +1972,43 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
        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
@@ -2050,7 +2082,26 @@ 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
@@ -2252,19 +2303,6 @@ debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, g
        }
 }
 
-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)
 {
@@ -2289,8 +2327,6 @@ 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);
 
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 9971feb..9d69a29 100644 (file)
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -293,7 +293,7 @@
             <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>
@@ -301,7 +301,7 @@
             <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>
@@ -309,7 +309,7 @@
             <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>
@@ -446,39 +446,39 @@
               </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>
@@ -762,7 +762,7 @@
                               </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>
@@ -3673,7 +3673,7 @@ location as the movie.</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>
@@ -3728,7 +3728,7 @@ location as the movie.</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>
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index d032b91..d9abf24 100644 (file)
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -737,17 +737,34 @@ preview_button_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, si
        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
@@ -770,6 +787,8 @@ preview_window_delete_cb(
 {
        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;
 }
 
diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h
index a25fd01..fdbf9ff 100644 (file)
--- a/gtk/src/resource_data.h
+++ b/gtk/src/resource_data.h
@@ -412,8 +412,8 @@
 "/property&gt;\n"
 "            &lt;property name=&quot;label&quot; translatable=&quot;yes&"
 "quot;&gt;_Picture Settings&lt;/property&gt;\n"
-"            &lt;signal handler=&quot;preview_button_clicked_cb&quot; na"
-"me=&quot;activate&quot;/&gt;\n"
+"            &lt;signal handler=&quot;preview_menu_clicked_cb&quot; name"
+"=&quot;activate&quot;/&gt;\n"
 "          &lt;/object&gt;\n"
 "        &lt;/child&gt;\n"
 "        &lt;child&gt;\n"
@@ -425,8 +425,8 @@
 ";/property&gt;\n"
 "            &lt;property name=&quot;label&quot; translatable=&quot;yes&"
 "quot;&gt;_Activity Window&lt;/property&gt;\n"
-"            &lt;signal handler=&quot;show_activity_clicked_cb&quot; nam"
-"e=&quot;activate&quot;/&gt;\n"
+"            &lt;signal handler=&quot;show_activity_menu_clicked_cb&quot"
+"; name=&quot;activate&quot;/&gt;\n"
 "          &lt;/object&gt;\n"
 "        &lt;/child&gt;\n"
 "        &lt;child&gt;\n"
@@ -438,8 +438,8 @@
 "roperty&gt;\n"
 "            &lt;property name=&quot;label&quot; translatable=&quot;yes&"
 "quot;&gt;Show _Queue&lt;/property&gt;\n"
-"            &lt;signal handler=&quot;show_queue_clicked_cb&quot; name=&"
-"quot;activate&quot;/&gt;\n"
+"            &lt;signal handler=&quot;show_queue_menu_clicked_cb&quot; n"
+"ame=&quot;activate&quot;/&gt;\n"
 "          &lt;/object&gt;\n"
 "        &lt;/child&gt;\n"
 "        &lt;child&gt;\n"
@@ -642,8 +642,8 @@
 "              &lt;/packing&gt;\n"
 "            &lt;/child&gt;\n"
 "            &lt;child&gt;\n"
-"              &lt;object class=&quot;GtkToolButton&quot; id=&quot;show_"
-"queue&quot;&gt;\n"
+"              &lt;object class=&quot;GtkToggleToolButton&quot; id=&quot"
+";show_queue&quot;&gt;\n"
 "                &lt;property name=&quot;visible&quot;&gt;True&lt;/prope"
 "rty&gt;\n"
 "                &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOT"
@@ -656,7 +656,7 @@
 "                &lt;property name=&quot;icon_name&quot;&gt;hb-queue&lt;"
 "/property&gt;\n"
 "                &lt;signal handler=&quot;show_queue_clicked_cb&quot; na"
-"me=&quot;clicked&quot;/&gt;\n"
+"me=&quot;toggled&quot;/&gt;\n"
 "              &lt;/object&gt;\n"
 "              &lt;packing&gt;\n"
 "                &lt;property name=&quot;expand&quot;&gt;False&lt;/prope"
@@ -664,8 +664,8 @@
 "              &lt;/packing&gt;\n"
 "            &lt;/child&gt;\n"
 "            &lt;child&gt;\n"
-"              &lt;object class=&quot;GtkToolButton&quot; id=&quot;show_"
-"picture&quot;&gt;\n"
+"              &lt;object class=&quot;GtkToggleToolButton&quot; id=&quot"
+";show_picture&quot;&gt;\n"
 "                &lt;property name=&quot;visible&quot;&gt;True&lt;/prope"
 "rty&gt;\n"
 "                &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOT"
@@ -677,7 +677,7 @@
 "yes&quot;&gt;Picture Settings&lt;/property&gt;\n"
 "                &lt;property name=&quot;icon_name&quot;&gt;hb-picture&l"
 "t;/property&gt;\n"
-"                &lt;signal name=&quot;clicked&quot; handler=&quot;previ"
+"                &lt;signal name=&quot;toggled&quot; handler=&quot;previ"
 "ew_button_clicked_cb&quot;/&gt;\n"
 "              &lt;/object&gt;\n"
 "              &lt;packing&gt;\n"
@@ -686,8 +686,8 @@
 "              &lt;/packing&gt;\n"
 "            &lt;/child&gt;\n"
 "            &lt;child&gt;\n"
-"              &lt;object class=&quot;GtkToolButton&quot; id=&quot;show_"
-"activity&quot;&gt;\n"
+"              &lt;object class=&quot;GtkToggleToolButton&quot; id=&quot"
+";show_activity&quot;&gt;\n"
 "                &lt;property name=&quot;visible&quot;&gt;True&lt;/prope"
 "rty&gt;\n"
 "                &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOT"
@@ -700,7 +700,7 @@
 "                &lt;property name=&quot;icon_name&quot;&gt;hb-activity&"
 "lt;/property&gt;\n"
 "                &lt;signal handler=&quot;show_activity_clicked_cb&quot;"
-" name=&quot;clicked&quot;/&gt;\n"
+" name=&quot;toggled&quot;/&gt;\n"
 "              &lt;/object&gt;\n"
 "              &lt;packing&gt;\n"
 "                &lt;property name=&quot;expand&quot;&gt;False&lt;/prope"
@@ -1152,7 +1152,7 @@
 "                            &lt;/child&gt;\n"
 "                            &lt;child&gt;\n"
 "                              &lt;object class=&quot;GtkTable&quot; id="
-"&quot;table1&quot;&gt;\n"
+"&quot;container_box&quot;&gt;\n"
 "                                &lt;property name=&quot;visible&quot;&g"
 "t;True&lt;/property&gt;\n"
 "                                &lt;property name=&quot;n_rows&quot;&gt"
@@ -5982,7 +5982,7 @@
 "y&gt;\n"
 "    &lt;property name=&quot;skip_pager_hint&quot;&gt;True&lt;/property&"
 "gt;\n"
-"    &lt;signal handler=&quot;gtk_widget_hide_on_delete&quot; name=&quot"
+"    &lt;signal handler=&quot;activity_window_delete_cb&quot; name=&quot"
 ";delete_event&quot;/&gt;\n"
 "    &lt;child&gt;\n"
 "      &lt;object class=&quot;GtkVBox&quot; id=&quot;vbox37&quot;&gt;\n"
@@ -6071,8 +6071,8 @@
 "y&gt;\n"
 "    &lt;property name=&quot;skip_pager_hint&quot;&gt;True&lt;/property&"
 "gt;\n"
-"    &lt;signal handler=&quot;gtk_widget_hide_on_delete&quot; name=&quot"
-";delete_event&quot;/&gt;\n"
+"    &lt;signal handler=&quot;queue_window_delete_cb&quot; name=&quot;de"
+"lete_event&quot;/&gt;\n"
 "    &lt;child&gt;\n"
 "      &lt;object class=&quot;GtkVBox&quot; id=&quot;vbox34&quot;&gt;\n"
 "        &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;\n"
diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist
index b12ce36..b0c415a 100644 (file)
--- a/gtk/src/resources.plist
+++ b/gtk/src/resources.plist
@@ -298,7 +298,7 @@
             &lt;property name=&quot;icon-name&quot;&gt;hb-picture&lt;/property&gt;
             &lt;property name=&quot;name&quot;&gt;show_preview_menu&lt;/property&gt;
             &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;_Picture Settings&lt;/property&gt;
-            &lt;signal handler=&quot;preview_button_clicked_cb&quot; name=&quot;activate&quot;/&gt;
+            &lt;signal handler=&quot;preview_menu_clicked_cb&quot; name=&quot;activate&quot;/&gt;
           &lt;/object&gt;
         &lt;/child&gt;
         &lt;child&gt;
@@ -306,7 +306,7 @@
             &lt;property name=&quot;icon-name&quot;&gt;hb-activity&lt;/property&gt;
             &lt;property name=&quot;name&quot;&gt;show_activity_menu&lt;/property&gt;
             &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;_Activity Window&lt;/property&gt;
-            &lt;signal handler=&quot;show_activity_clicked_cb&quot; name=&quot;activate&quot;/&gt;
+            &lt;signal handler=&quot;show_activity_menu_clicked_cb&quot; name=&quot;activate&quot;/&gt;
           &lt;/object&gt;
         &lt;/child&gt;
         &lt;child&gt;
@@ -314,7 +314,7 @@
             &lt;property name=&quot;icon-name&quot;&gt;hb-queue&lt;/property&gt;
             &lt;property name=&quot;name&quot;&gt;show_queue_menu&lt;/property&gt;
             &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Show _Queue&lt;/property&gt;
-            &lt;signal handler=&quot;show_queue_clicked_cb&quot; name=&quot;activate&quot;/&gt;
+            &lt;signal handler=&quot;show_queue_menu_clicked_cb&quot; name=&quot;activate&quot;/&gt;
           &lt;/object&gt;
         &lt;/child&gt;
         &lt;child&gt;
@@ -451,39 +451,39 @@
               &lt;/packing&gt;
             &lt;/child&gt;
             &lt;child&gt;
-              &lt;object class=&quot;GtkToolButton&quot; id=&quot;show_queue&quot;&gt;
+              &lt;object class=&quot;GtkToggleToolButton&quot; id=&quot;show_queue&quot;&gt;
                 &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                 &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
                 &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;Show Queue&lt;/property&gt;
                 &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Show Queue&lt;/property&gt;
                 &lt;property name=&quot;icon_name&quot;&gt;hb-queue&lt;/property&gt;
-                &lt;signal handler=&quot;show_queue_clicked_cb&quot; name=&quot;clicked&quot;/&gt;
+                &lt;signal handler=&quot;show_queue_clicked_cb&quot; name=&quot;toggled&quot;/&gt;
               &lt;/object&gt;
               &lt;packing&gt;
                 &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
               &lt;/packing&gt;
             &lt;/child&gt;
             &lt;child&gt;
-              &lt;object class=&quot;GtkToolButton&quot; id=&quot;show_picture&quot;&gt;
+              &lt;object class=&quot;GtkToggleToolButton&quot; id=&quot;show_picture&quot;&gt;
                 &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                 &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
                 &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;Open Picture Settings&lt;/property&gt;
                 &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Picture Settings&lt;/property&gt;
                 &lt;property name=&quot;icon_name&quot;&gt;hb-picture&lt;/property&gt;
-                &lt;signal name=&quot;clicked&quot; handler=&quot;preview_button_clicked_cb&quot;/&gt;
+                &lt;signal name=&quot;toggled&quot; handler=&quot;preview_button_clicked_cb&quot;/&gt;
               &lt;/object&gt;
               &lt;packing&gt;
                 &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
               &lt;/packing&gt;
             &lt;/child&gt;
             &lt;child&gt;
-              &lt;object class=&quot;GtkToolButton&quot; id=&quot;show_activity&quot;&gt;
+              &lt;object class=&quot;GtkToggleToolButton&quot; id=&quot;show_activity&quot;&gt;
                 &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                 &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
                 &lt;property name=&quot;tooltip-text&quot; translatable=&quot;yes&quot;&gt;Show Activity Window&lt;/property&gt;
                 &lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Activity Window&lt;/property&gt;
                 &lt;property name=&quot;icon_name&quot;&gt;hb-activity&lt;/property&gt;
-                &lt;signal handler=&quot;show_activity_clicked_cb&quot; name=&quot;clicked&quot;/&gt;
+                &lt;signal handler=&quot;show_activity_clicked_cb&quot; name=&quot;toggled&quot;/&gt;
               &lt;/object&gt;
               &lt;packing&gt;
                 &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
@@ -767,7 +767,7 @@
                               &lt;/packing&gt;
                             &lt;/child&gt;
                             &lt;child&gt;
-                              &lt;object class=&quot;GtkTable&quot; id=&quot;table1&quot;&gt;
+                              &lt;object class=&quot;GtkTable&quot; id=&quot;container_box&quot;&gt;
                                 &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
                                 &lt;property name=&quot;n_rows&quot;&gt;2&lt;/property&gt;
                                 &lt;property name=&quot;n_columns&quot;&gt;2&lt;/property&gt;
@@ -3678,7 +3678,7 @@ location as the movie.&lt;/property&gt;
     &lt;property name=&quot;type_hint&quot;&gt;GDK_WINDOW_TYPE_HINT_DIALOG&lt;/property&gt;
     &lt;property name=&quot;skip_taskbar_hint&quot;&gt;True&lt;/property&gt;
     &lt;property name=&quot;skip_pager_hint&quot;&gt;True&lt;/property&gt;
-    &lt;signal handler=&quot;gtk_widget_hide_on_delete&quot; name=&quot;delete_event&quot;/&gt;
+    &lt;signal handler=&quot;activity_window_delete_cb&quot; name=&quot;delete_event&quot;/&gt;
     &lt;child&gt;
       &lt;object class=&quot;GtkVBox&quot; id=&quot;vbox37&quot;&gt;
         &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
@@ -3733,7 +3733,7 @@ location as the movie.&lt;/property&gt;
     &lt;property name=&quot;type_hint&quot;&gt;GDK_WINDOW_TYPE_HINT_DIALOG&lt;/property&gt;
     &lt;property name=&quot;skip_taskbar_hint&quot;&gt;True&lt;/property&gt;
     &lt;property name=&quot;skip_pager_hint&quot;&gt;True&lt;/property&gt;
-    &lt;signal handler=&quot;gtk_widget_hide_on_delete&quot; name=&quot;delete_event&quot;/&gt;
+    &lt;signal handler=&quot;queue_window_delete_cb&quot; name=&quot;delete_event&quot;/&gt;
     &lt;child&gt;
       &lt;object class=&quot;GtkVBox&quot; id=&quot;vbox34&quot;&gt;
         &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
githubのコードからのfolk
About OSDN
Find Software
Develop Software
Help