From 437e43308bc69e6d40d8252bd932276e2ba68a8e Mon Sep 17 00:00:00 2001 From: 05356787 <05356787@localhost.localdomain> Date: Thu, 30 Oct 2008 08:48:41 -0200 Subject: Allow adding more information per column --- hardinfo2/computer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hardinfo2/computer.c') diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 84e87610..379a091c 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -363,7 +363,8 @@ gchar *callback_network() "ReloadInterval=3000\n" "ViewType=1\n" "ColumnTitle$TextValue=Device\n" - "ColumnTitle$Value=Statistics\n" + "ColumnTitle$Value=IP Address\n" + "ColumnTitle$Extra1=Statistics\n" "ShowColumnHeaders=true\n" "%s", network_interfaces, network_icons); } -- cgit v1.2.3 From ff03a5d1bf53392f324e4653764b3079bd94c4bf Mon Sep 17 00:00:00 2001 From: 05356787 <05356787@localhost.localdomain> Date: Thu, 30 Oct 2008 09:17:45 -0200 Subject: Cleanups --- hardinfo2/arch/linux/common/filesystem.h | 4 ++-- hardinfo2/arch/linux/common/net.h | 5 ++--- hardinfo2/computer.c | 3 ++- hardinfo2/shell.c | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'hardinfo2/computer.c') diff --git a/hardinfo2/arch/linux/common/filesystem.h b/hardinfo2/arch/linux/common/filesystem.h index 3581ccbb..b3008387 100644 --- a/hardinfo2/arch/linux/common/filesystem.h +++ b/hardinfo2/arch/linux/common/filesystem.h @@ -81,9 +81,9 @@ scan_filesystems(void) stravail); g_hash_table_insert(moreinfo, g_strdup_printf("FS%d", ++count), strhash); - fs_list = h_strdup_cprintf("$FS%d$%s=%s total, %s free\n", + fs_list = h_strdup_cprintf("$FS%d$%s=%s|%s\n", fs_list, - count, tmp[0], strsize, stravail); + count, tmp[0], stravail, strsize); g_free(strsize); g_free(stravail); diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h index 23cfa9da..8c083a9e 100644 --- a/hardinfo2/arch/linux/common/net.h +++ b/hardinfo2/arch/linux/common/net.h @@ -342,12 +342,11 @@ static void scan_net_interfaces_24(void) network_interfaces = h_strdup_cprintf - ("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB|%s\n", + ("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB\n", network_interfaces, devid, ifacename, ni.ip[0] ? ni.ip : "", trans_mb, recv_mb); - net_get_iface_type(ifacename, &iface_type, &iface_icon, &ni); - + network_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", network_icons, devid, ifacename, iface_icon); diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 379a091c..74244762 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -316,7 +316,8 @@ gchar *callback_fs() "ViewType=1\n" "ReloadInterval=5000\n" "ColumnTitle$TextValue=Mount Point\n" - "ColumnTitle$Value=Total / Free Space\n" + "ColumnTitle$Value=Free\n" + "ColumnTitle$Extra1=Total\n" "ShowColumnHeaders=true\n" "[Mounted File Systems]\n%s\n", fs_list); } diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 01b56fa5..2a61246b 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -1109,6 +1109,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) g_object_ref(shell->info->model); gtk_tree_view_set_model(GTK_TREE_VIEW(shell->info->view), NULL); + gdk_window_freeze_updates(shell->window->window); gtk_tree_store_clear(store); @@ -1141,6 +1142,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) update_progress(); } + gdk_window_thaw_updates(shell->window->window); shell_set_note_from_entry(entry); g_strfreev(groups); -- cgit v1.2.3 From 1d2c77e7e1b4c3fcbc6a36dd89fe3287c324e032 Mon Sep 17 00:00:00 2001 From: Leandro Pereira Date: Thu, 30 Oct 2008 14:50:39 -0200 Subject: Fix typo --- hardinfo2/computer.c | 2 +- hardinfo2/shell.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'hardinfo2/computer.c') diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 74244762..f51fdb36 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -315,7 +315,7 @@ gchar *callback_fs() return g_strdup_printf("[$ShellParam$]\n" "ViewType=1\n" "ReloadInterval=5000\n" - "ColumnTitle$TextValue=Mount Point\n" + "ColumnTitle$TextValue=Device\n" "ColumnTitle$Value=Free\n" "ColumnTitle$Extra1=Total\n" "ShowColumnHeaders=true\n" diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 99c575e9..23ba2ad7 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -1134,21 +1134,23 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) g_strfreev(keys); } + /* */ if (!has_shell_param) { gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(shell->info->view), FALSE); } + /* */ g_object_unref(shell->info->model); gtk_tree_view_set_model(GTK_TREE_VIEW(shell->info->view), shell->info->model); gtk_tree_view_expand_all(GTK_TREE_VIEW(shell->info->view)); + gdk_window_thaw_updates(shell->info->view->window); + shell_set_note_from_entry(entry); + if (shell->view_type == SHELL_VIEW_PROGRESS) { update_progress(); } - gdk_window_thaw_updates(shell->info->view->window); - shell_set_note_from_entry(entry); - g_strfreev(groups); g_key_file_free(key_file); g_free(key_data); -- cgit v1.2.3