From 75b4332b70fde1272c2c57c7416dccb1c569c98a Mon Sep 17 00:00:00 2001 From: "Leandro A. F. Pereira" Date: Thu, 28 Dec 2006 13:14:57 +0000 Subject: Tango icons. --- hardinfo2/pixmaps/audio.png | Bin 1414 -> 1159 bytes hardinfo2/pixmaps/cdrom.png | Bin 1235 -> 1028 bytes hardinfo2/pixmaps/computer.png | Bin 937 -> 953 bytes hardinfo2/pixmaps/dev_removable.png | Bin 815 -> 612 bytes hardinfo2/pixmaps/dialog-error.png | Bin 0 -> 925 bytes hardinfo2/pixmaps/dialog-information.png | Bin 0 -> 1204 bytes hardinfo2/pixmaps/dialog-warning.png | Bin 0 -> 954 bytes hardinfo2/pixmaps/gnome-terminal.png | Bin 1077 -> 1026 bytes hardinfo2/pixmaps/hdd.png | Bin 793 -> 624 bytes hardinfo2/pixmaps/joystick.png | Bin 754 -> 927 bytes hardinfo2/pixmaps/keyboard.png | Bin 1164 -> 796 bytes hardinfo2/pixmaps/language.png | Bin 1145 -> 1210 bytes hardinfo2/pixmaps/logo.png | Bin 3182 -> 3836 bytes hardinfo2/pixmaps/logo.svg | 771 +++++++++++++++++++++++++++++++ hardinfo2/pixmaps/memory.png | Bin 1044 -> 991 bytes hardinfo2/pixmaps/module.png | Bin 1049 -> 1044 bytes hardinfo2/pixmaps/monitor.png | Bin 981 -> 788 bytes hardinfo2/pixmaps/mouse.png | Bin 922 -> 1128 bytes hardinfo2/pixmaps/network.png | Bin 739 -> 1130 bytes hardinfo2/pixmaps/os.png | Bin 1094 -> 1488 bytes hardinfo2/pixmaps/printer.png | Bin 1015 -> 810 bytes hardinfo2/pixmaps/shares.png | Bin 990 -> 849 bytes hardinfo2/pixmaps/summary.png | Bin 966 -> 1358 bytes hardinfo2/pixmaps/users.png | Bin 1499 -> 1277 bytes hardinfo2/pixmaps/videocap.png | Bin 1724 -> 1003 bytes hardinfo2/shell.c | 12 +- 26 files changed, 777 insertions(+), 6 deletions(-) create mode 100644 hardinfo2/pixmaps/dialog-error.png create mode 100644 hardinfo2/pixmaps/dialog-information.png create mode 100644 hardinfo2/pixmaps/dialog-warning.png create mode 100644 hardinfo2/pixmaps/logo.svg (limited to 'hardinfo2') diff --git a/hardinfo2/pixmaps/audio.png b/hardinfo2/pixmaps/audio.png index 45096651..93d99aa4 100644 Binary files a/hardinfo2/pixmaps/audio.png and b/hardinfo2/pixmaps/audio.png differ diff --git a/hardinfo2/pixmaps/cdrom.png b/hardinfo2/pixmaps/cdrom.png index eb65bcbb..af2c8261 100644 Binary files a/hardinfo2/pixmaps/cdrom.png and b/hardinfo2/pixmaps/cdrom.png differ diff --git a/hardinfo2/pixmaps/computer.png b/hardinfo2/pixmaps/computer.png index f0de0386..8b3716cf 100644 Binary files a/hardinfo2/pixmaps/computer.png and b/hardinfo2/pixmaps/computer.png differ diff --git a/hardinfo2/pixmaps/dev_removable.png b/hardinfo2/pixmaps/dev_removable.png index 2453d8dc..f4873104 100644 Binary files a/hardinfo2/pixmaps/dev_removable.png and b/hardinfo2/pixmaps/dev_removable.png differ diff --git a/hardinfo2/pixmaps/dialog-error.png b/hardinfo2/pixmaps/dialog-error.png new file mode 100644 index 00000000..7d6aaf6f Binary files /dev/null and b/hardinfo2/pixmaps/dialog-error.png differ diff --git a/hardinfo2/pixmaps/dialog-information.png b/hardinfo2/pixmaps/dialog-information.png new file mode 100644 index 00000000..07cf0102 Binary files /dev/null and b/hardinfo2/pixmaps/dialog-information.png differ diff --git a/hardinfo2/pixmaps/dialog-warning.png b/hardinfo2/pixmaps/dialog-warning.png new file mode 100644 index 00000000..45b64a79 Binary files /dev/null and b/hardinfo2/pixmaps/dialog-warning.png differ diff --git a/hardinfo2/pixmaps/gnome-terminal.png b/hardinfo2/pixmaps/gnome-terminal.png index 2fe2d14d..ceb0fb99 100644 Binary files a/hardinfo2/pixmaps/gnome-terminal.png and b/hardinfo2/pixmaps/gnome-terminal.png differ diff --git a/hardinfo2/pixmaps/hdd.png b/hardinfo2/pixmaps/hdd.png index bbcdc825..da413059 100644 Binary files a/hardinfo2/pixmaps/hdd.png and b/hardinfo2/pixmaps/hdd.png differ diff --git a/hardinfo2/pixmaps/joystick.png b/hardinfo2/pixmaps/joystick.png index 954cca4b..18f77392 100644 Binary files a/hardinfo2/pixmaps/joystick.png and b/hardinfo2/pixmaps/joystick.png differ diff --git a/hardinfo2/pixmaps/keyboard.png b/hardinfo2/pixmaps/keyboard.png index a716f07e..fb422a0d 100644 Binary files a/hardinfo2/pixmaps/keyboard.png and b/hardinfo2/pixmaps/keyboard.png differ diff --git a/hardinfo2/pixmaps/language.png b/hardinfo2/pixmaps/language.png index ab82b50f..38b36b48 100644 Binary files a/hardinfo2/pixmaps/language.png and b/hardinfo2/pixmaps/language.png differ diff --git a/hardinfo2/pixmaps/logo.png b/hardinfo2/pixmaps/logo.png index d2dee31e..ed4f8ef5 100644 Binary files a/hardinfo2/pixmaps/logo.png and b/hardinfo2/pixmaps/logo.png differ diff --git a/hardinfo2/pixmaps/logo.svg b/hardinfo2/pixmaps/logo.svg new file mode 100644 index 00000000..159b96ed --- /dev/null +++ b/hardinfo2/pixmaps/logo.svg @@ -0,0 +1,771 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Computer + 2005-03-08 + + + Jakub Steiner + + + + + workstation + computer + node + client + + + + http://jimmac.musichall.cz/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + i + + + diff --git a/hardinfo2/pixmaps/memory.png b/hardinfo2/pixmaps/memory.png index 1ea66b8a..16a45b9f 100644 Binary files a/hardinfo2/pixmaps/memory.png and b/hardinfo2/pixmaps/memory.png differ diff --git a/hardinfo2/pixmaps/module.png b/hardinfo2/pixmaps/module.png index 8f1279d0..2bb2adfc 100644 Binary files a/hardinfo2/pixmaps/module.png and b/hardinfo2/pixmaps/module.png differ diff --git a/hardinfo2/pixmaps/monitor.png b/hardinfo2/pixmaps/monitor.png index 669086a4..58fc213e 100644 Binary files a/hardinfo2/pixmaps/monitor.png and b/hardinfo2/pixmaps/monitor.png differ diff --git a/hardinfo2/pixmaps/mouse.png b/hardinfo2/pixmaps/mouse.png index 4043722d..c1bbc79d 100644 Binary files a/hardinfo2/pixmaps/mouse.png and b/hardinfo2/pixmaps/mouse.png differ diff --git a/hardinfo2/pixmaps/network.png b/hardinfo2/pixmaps/network.png index f8c623b6..51c8b16f 100644 Binary files a/hardinfo2/pixmaps/network.png and b/hardinfo2/pixmaps/network.png differ diff --git a/hardinfo2/pixmaps/os.png b/hardinfo2/pixmaps/os.png index 166c2201..4decc893 100644 Binary files a/hardinfo2/pixmaps/os.png and b/hardinfo2/pixmaps/os.png differ diff --git a/hardinfo2/pixmaps/printer.png b/hardinfo2/pixmaps/printer.png index dd814d6c..65caccf3 100644 Binary files a/hardinfo2/pixmaps/printer.png and b/hardinfo2/pixmaps/printer.png differ diff --git a/hardinfo2/pixmaps/shares.png b/hardinfo2/pixmaps/shares.png index ab4e197d..91ccf9b7 100644 Binary files a/hardinfo2/pixmaps/shares.png and b/hardinfo2/pixmaps/shares.png differ diff --git a/hardinfo2/pixmaps/summary.png b/hardinfo2/pixmaps/summary.png index 5a2cd965..0abb49f3 100644 Binary files a/hardinfo2/pixmaps/summary.png and b/hardinfo2/pixmaps/summary.png differ diff --git a/hardinfo2/pixmaps/users.png b/hardinfo2/pixmaps/users.png index cbc62084..bced28cf 100644 Binary files a/hardinfo2/pixmaps/users.png and b/hardinfo2/pixmaps/users.png differ diff --git a/hardinfo2/pixmaps/videocap.png b/hardinfo2/pixmaps/videocap.png index 8bbea0ba..e84992c3 100644 Binary files a/hardinfo2/pixmaps/videocap.png and b/hardinfo2/pixmaps/videocap.png differ diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 96458758..de75d6c7 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -722,14 +722,14 @@ group_handle_special(GKeyFile * key_file, ShellModuleEntry * entry, static void group_handle_normal(GKeyFile * key_file, ShellModuleEntry * entry, - gchar * group, gchar ** keys) + gchar * group, gchar ** keys, gsize ngroups) { GtkTreeIter parent; GtkTreeStore *store = GTK_TREE_STORE(shell->info->model); gchar *tmp = g_strdup(group); gint i; - if (shell->view_type != SHELL_VIEW_PROGRESS) { + if (ngroups > 1) { gtk_tree_store_append(store, &parent, NULL); strend(tmp, '#'); @@ -749,7 +749,7 @@ group_handle_normal(GKeyFile * key_file, ShellModuleEntry * entry, } if (g_utf8_validate(key, -1, NULL) && g_utf8_validate(value, -1, NULL)) { - if (shell->view_type == SHELL_VIEW_PROGRESS) { + if (ngroups == 1) { gtk_tree_store_append(store, &child, NULL); } else { gtk_tree_store_append(store, &child, &parent); @@ -847,7 +847,6 @@ update_progress() cur = 100 - 100 * atof(tmp) / maxv; maxp = MAX(cur, maxp); - gtk_tree_store_set(store, &iter, INFO_TREE_COL_PROGRESS, cur, -1); g_free(tmp); } while (gtk_tree_model_iter_next(model, &iter)); @@ -874,6 +873,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) gchar **groups; GtkTreeStore *store; gint i; + gsize ngroups; if (entry->func) { key_data = entry->func(entry->number); @@ -897,7 +897,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) gtk_tree_store_clear(store); g_key_file_load_from_data(key_file, key_data, strlen(key_data), 0, NULL); - groups = g_key_file_get_groups(key_file, NULL); + groups = g_key_file_get_groups(key_file, &ngroups); for (i = 0; groups[i]; i++) { gchar *group = groups[i]; @@ -906,7 +906,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) if (*group == '$') { group_handle_special(key_file, entry, group, keys); } else { - group_handle_normal(key_file, entry, group, keys); + group_handle_normal(key_file, entry, group, keys, ngroups - 1); } } -- cgit v1.2.3