Changeset c7af2a1a45e17e991a5b22837aa5f5c9d3c0be53

Timestamp:

02/28/10 14:21:44 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

0d5a0067dd12486d570d26414152cab8f2249746

Parents:

7a24d7c912698f72886e94f6098224793f520fbf

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-02-28T14:21:44Z+0200

Message:

xrun/load progressbar reborn in new place

Location:

gui

Files:

• gladish.ui (modified) (2 diffs)
• main.c (modified) (7 diffs)

gui/gladish.ui

@@ -250 +250 @@
                         <property name="related_action">clear_xruns_and_max_dsp_load_action</property>
                         <property name="use_action_appearance">True</property>
+                        <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -439 +440 @@
             <property name="position">204</property>
             <child>
-              <object class="GtkViewport" id="world_tree_viewport">
-                <property name="visible">True</property>
-                <property name="resize_mode">queue</property>
+              <object class="GtkVBox" id="left_pane_vbox">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkTreeView" id="world_tree">
+                  <object class="GtkViewport" id="world_tree_viewport">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </object>
+                    <property name="resize_mode">queue</property>
+                    <child>
+                      <object class="GtkTreeView" id="world_tree">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkProgressBar" id="xrun_progress_bar">
+                    <property name="visible">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>

gui/main.c

@@ -93 +93 @@
 GtkWidget * g_xruns_label;
 
+GtkWidget * g_xrun_progress_bar;
+
 graph_view_handle g_jack_view = NULL;
 graph_view_handle g_studio_view = NULL;
@@ -324 +326 @@
     snprintf(tmp_buf, sizeof(tmp_buf), "%" PRIu32 " dropouts", xruns);
     gtk_label_set_text(GTK_LABEL(g_xruns_label), tmp_buf);
+    gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), tmp_buf);
   }
   else
   {
+    gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), "error");
+    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), 0.0);
     gtk_label_set_text(GTK_LABEL(g_xruns_label), "?");
   }
@@ -335 +340 @@
     {
       g_jack_max_dsp_load = load;
+      gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), load / 100.0);
     }
 
@@ -800 +806 @@
   }
 
-  //gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), status);
+  gtk_progress_bar_set_text(GTK_PROGRESS_BAR(g_xrun_progress_bar), status);
   gtk_label_set_text(GTK_LABEL(g_studio_status_label), name);
 
@@ -839 +845 @@
   else
   {
-    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), g_jack_state == JACK_STATE_NA ? "JACK is sick" : "JACK is stopped");
+    gtk_label_set_text(GTK_LABEL(g_sample_rate_label), "");
     gtk_label_set_text(GTK_LABEL(g_latency_label), "");
     gtk_label_set_text(GTK_LABEL(g_dsp_load_label), "");
@@ -1010 +1016 @@
   buffer_size_clear();
   gtk_action_set_sensitive(g_clear_load_and_max_dsp_action, false);
+  gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(g_xrun_progress_bar), 0.0);
 }
 
@@ -1227 +1234 @@
   g_toolbar = get_gtk_builder_widget("toolbar");
   g_statusbar = GTK_STATUSBAR(get_gtk_builder_widget("statusbar"));
+  g_xrun_progress_bar = get_gtk_builder_widget("xrun_progress_bar");
 
   g_name_dialog = get_gtk_builder_widget("name_dialog");