Changeset fa67487ea8ca6701a10256e458178aa161280964

Timestamp:

02/21/10 22:24:39 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

7a24d7c912698f72886e94f6098224793f520fbf

Parents:

44cdd3164cb959ab9418ac310b52388d8cc96ca7

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-02-21T22:24:39Z+0200

Message:

'clear xruns and dsp load' is now also available from the menu

Location:

gui

Files:

• gladish.ui (modified) (3 diffs)
• gtk_builder.c (modified) (2 diffs)
• gtk_builder.h (modified) (1 diff)
• main.c (modified) (7 diffs)

gui/gladish.ui

@@ -245 +245 @@
                     <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>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menu_item_jack_clear">
+                        <property name="visible">True</property>
+                        <property name="related_action">clear_xruns_and_max_dsp_load_action</property>
+                        <property name="use_action_appearance">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkImageMenuItem" id="menu_item_jack_configure">
@@ -387 +395 @@
               <object class="GtkToolButton" id="clear_load_button">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
+                <property name="related_action">clear_xruns_and_max_dsp_load_action</property>
+                <property name="use_action_appearance">True</property>
                 <property name="label" translatable="yes">Clear XRuns</property>
-                <property name="stock_id">gtk-clear</property>
               </object>
               <packing>
@@ -1143 +1151 @@
     </action-widgets>
   </object>
+  <object class="GtkAction" id="clear_xruns_and_max_dsp_load_action">
+    <property name="label">Clear XRuns and Max DSP Load</property>
+    <property name="short_label">Clear</property>
+    <property name="stock_id">gtk-clear</property>
+    <property name="is_important">True</property>
+  </object>
 </interface>

gui/gtk_builder.c

@@ -81 +81 @@
 }
 
-GtkWidget * get_gtk_builder_widget(const char * name)
+GObject * get_gtk_builder_object(const char * name)
 {
-  GtkWidget * ptr;
+  GObject * ptr;
 
-  ptr = GTK_WIDGET(gtk_builder_get_object(g_builder, name));
+  ptr = gtk_builder_get_object(g_builder, name);
 
   if (ptr == NULL)
@@ -95 +95 @@
   return ptr;
 }
+
+GtkWidget * get_gtk_builder_widget(const char * name)
+{
+  return GTK_WIDGET(get_gtk_builder_object(name));
+}

gui/gtk_builder.h

@@ -31 +31 @@
 void uninit_gtk_builder(void);
 GtkWidget * get_gtk_builder_widget(const char * name);
+GObject * get_gtk_builder_object(const char * name);
 
 #endif /* #ifndef GTK_BUILDER_H__E2BF7CFC_1B04_4160_9165_A1B433C6B3C2__INCLUDED */

gui/main.c

@@ -53 +53 @@
 GtkWidget * g_main_win;
 
-GtkWidget * g_clear_load_button;
+GtkAction * g_clear_load_and_max_dsp_action;
 GtkStatusbar * g_statusbar;
 
@@ -346 +346 @@
 }
 
-static void clear_load(void)
+static void clear_load_and_max_dsp(void)
 {
   jack_proxy_reset_xruns();
@@ -990 +990 @@
   set_latency_items_sensivity(true);
   update_buffer_size(true);
-  gtk_widget_set_sensitive(g_clear_load_button, true);
+  gtk_action_set_sensitive(g_clear_load_and_max_dsp_action, true);
 
   g_jack_poll_source_tag = g_timeout_add(100, poll_jack, NULL);
@@ -1009 +1009 @@
   set_latency_items_sensivity(false);
   buffer_size_clear();
-  gtk_widget_set_sensitive(g_clear_load_button, false);
+  gtk_action_set_sensitive(g_clear_load_and_max_dsp_action, false);
 }
 
@@ -1210 +1210 @@
 
   g_main_win = get_gtk_builder_widget("main_win");
-  g_clear_load_button = get_gtk_builder_widget("clear_load_button");
+  g_clear_load_and_max_dsp_action = GTK_ACTION(get_gtk_builder_object("clear_xruns_and_max_dsp_load_action"));
   g_menu_item_new_studio = get_gtk_builder_widget("menu_item_new_studio");
   g_menu_item_start_app = get_gtk_builder_widget("menu_item_start_app");
@@ -1302 +1302 @@
   g_signal_connect(G_OBJECT(g_main_win), "destroy", G_CALLBACK(gtk_main_quit), NULL);
   g_signal_connect(G_OBJECT(get_gtk_builder_widget("menu_item_quit")), "activate", G_CALLBACK(gtk_main_quit), NULL);
-  g_signal_connect(G_OBJECT(g_clear_load_button), "clicked", G_CALLBACK(clear_load), NULL);
   g_signal_connect(G_OBJECT(get_gtk_builder_widget("menu_item_view_arrange")), "activate", G_CALLBACK(arrange), NULL);
   g_signal_connect(G_OBJECT(g_menu_item_view_toolbar), "activate", G_CALLBACK(toggle_toolbar), NULL);
@@ -1327 +1326 @@
   g_signal_connect(G_OBJECT(g_menu_item_jack_latency_8192), "toggled", G_CALLBACK(buffer_size_change_request), (gpointer)8192);
 
+  g_signal_connect(G_OBJECT(g_clear_load_and_max_dsp_action), "activate", G_CALLBACK(clear_load_and_max_dsp), NULL);
+
   gtk_widget_show(g_main_win);