This is an automated email from the git hooks/post-receive script. omegaphil pushed a commit to branch omegaphil/graph-disk-io in repository panel-plugins/xfce4-hardware-monitor-plugin.
commit 553d0f9a1dd15ba7bd9aa5306dc4f07a6e4699a7 Author: OmegaPhil <omegap...@startmail.com> Date: Sat Apr 30 17:21:20 2016 +0100 WIP prior to porting to GtkBuilder --- src/ui.glade | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 193 insertions(+), 21 deletions(-) diff --git a/src/ui.glade b/src/ui.glade index b0dfbc0..63a32d9 100644 --- a/src/ui.glade +++ b/src/ui.glade @@ -357,7 +357,7 @@ view</property> <property name="border_width">12</property> <property name="spacing">12</property> <child> - <widget class="GtkVBox" id="disk_vbox"> + <widget class="GtkVBox" id="disk_usage_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> @@ -513,54 +513,127 @@ view</property> </packing> </child> <child> - <widget class="GtkVBox" id="memory_vbox"> + <widget class="GtkVBox" id="disk_usage_vboxx"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <widget class="GtkRadioButton" id="memory_usage_radiobutton"> - <property name="label" translatable="yes">_Memory usage</property> + <widget class="GtkRadioButton" id="disk_stats_radiobutton"> + <property name="label" translatable="yes">D_isk statistics</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip" translatable="yes">The amount of memory used</property> + <property name="tooltip" translatable="yes">Disk/device statistics available from /proc/diskstats</property> <property name="use_underline">True</property> + <property name="active">True</property> <property name="draw_indicator">True</property> - <property name="group">cpu_usage_radiobutton</property> </widget> <packing> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="memory_usage_options"> + <widget class="GtkHBox" id="disk_stats_options"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">False</property> <child> - <widget class="GtkVBox" id="memory_options_vbox"> + <widget class="GtkVBox" id="disk_stats_options_vbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> <child> - <widget class="GtkHBox" id="memory_tag_hbox"> + <widget class="GtkHBox" id="disk_stats_device_hbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="memory_tag_label"> + <widget class="GtkLabel" id="disk_stats_device_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Tag: </property> + <property name="label" translatable="yes">Disk:</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkComboBoxText" id="disk_stats_device_comboboxtext"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </widget> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="disk_stats_stat_hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <widget class="GtkLabel" id="disk_stats_stat_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Stat:</property> </widget> <packing> <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="disk_stats_stat_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </widget> + <packing> + <property name="expand">True</property> <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="disk_stats_tag_hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <widget class="GtkLabel" id="disk_stats_tag_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip" translatable="yes">Tag to display along with monitor data +in the optional text overlay in a curve +view</property> + <property name="label" translatable="yes">Tag: </property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="memory_tag_entry"> + <widget class="GtkEntry" id="disk_stats_tag_entry"> <property name="width_request">80</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -583,9 +656,12 @@ view</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">2</property> </packing> </child> + <child> + <placeholder/> + </child> </widget> <packing> <property name="expand">True</property> @@ -594,13 +670,10 @@ view</property> <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </widget> <packing> - <property name="expand">False</property> - <property name="fill">False</property> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -713,6 +786,105 @@ view</property> <property name="position">2</property> </packing> </child> + <child> + <widget class="GtkVBox" id="memory_vbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <widget class="GtkRadioButton" id="memory_usage_radiobutton"> + <property name="label" translatable="yes">_Memory usage</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip" translatable="yes">The amount of memory used</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">cpu_usage_radiobutton</property> + </widget> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="memory_usage_options"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <child> + <widget class="GtkVBox" id="memory_options_vbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <widget class="GtkHBox" id="memory_tag_hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <widget class="GtkLabel" id="memory_tag_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Tag: </property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="memory_tag_entry"> + <property name="width_request">80</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Tag to display along with monitor data +in the optional text overlay in a curve +view</property> + <property name="invisible_char">●</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">18</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> </widget> <packing> <property name="position">1</property> -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits