aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/stock.h2
-rw-r--r--includes/uidefs.h13
-rwxr-xr-xpixmaps/clipboard.pngbin0 -> 3293 bytes
-rwxr-xr-xpixmaps/refresh.pngbin0 -> 18924 bytes
-rwxr-xr-xpixmaps/server_sync.pngbin0 -> 17810 bytes
-rw-r--r--shell/callbacks.c24
-rw-r--r--shell/menu.c8
-rw-r--r--shell/shell.c31
-rw-r--r--shell/stock.c4
-rw-r--r--shell/syncmanager.c2
10 files changed, 55 insertions, 29 deletions
diff --git a/includes/stock.h b/includes/stock.h
index b79c263e..d3efffdb 100644
--- a/includes/stock.h
+++ b/includes/stock.h
@@ -19,6 +19,8 @@
#ifndef __STOCK_H__
#define __STOCK_H__
+#define HI_STOCK_CLIPBOARD "hi-stock-clipboard"
+#define HI_STOCK_REFRESH "hi-stock-refresh"
#define HI_STOCK_REPORT "hi-stock-report"
#define HI_STOCK_INTERNET "hi-stock-internet"
#define HI_STOCK_MODULE "hi-stock-module"
diff --git a/includes/uidefs.h b/includes/uidefs.h
index 51295d86..e838754a 100644
--- a/includes/uidefs.h
+++ b/includes/uidefs.h
@@ -45,11 +45,6 @@ char *uidefs_str =
" <menu name=\"HelpMenu\" action=\"HelpMenuAction\">"
" <menuitem name=\"WebPage\" action=\"HomePageAction\"/>"
" <menuitem name=\"ReportBug\" action=\"ReportBugAction\"/>"
- " <separator/>"
- " <menu name=\"HelpMenuModules\" "
- "action=\"HelpMenuModulesAction\">"
- " <separator name=\"LastSep\"/>"
- " </menu>"
" <menuitem name=\"About\" action=\"AboutAction\"/>"
" </menu>"
" </menubar>"
@@ -66,4 +61,12 @@ char *uidefs_str =
" </toolbar>"
"</ui>";
+/*DISABLED
+ " <separator/>"
+ " <menu name=\"HelpMenuModules\" "
+ "action=\"HelpMenuModulesAction\">"
+ " <separator name=\"LastSep\"/>"
+ " </menu>"
+*/
+
#endif /* __UIDEFS_H__ */
diff --git a/pixmaps/clipboard.png b/pixmaps/clipboard.png
new file mode 100755
index 00000000..a5124bcc
--- /dev/null
+++ b/pixmaps/clipboard.png
Binary files differ
diff --git a/pixmaps/refresh.png b/pixmaps/refresh.png
new file mode 100755
index 00000000..cb9c755d
--- /dev/null
+++ b/pixmaps/refresh.png
Binary files differ
diff --git a/pixmaps/server_sync.png b/pixmaps/server_sync.png
new file mode 100755
index 00000000..99651a14
--- /dev/null
+++ b/pixmaps/server_sync.png
Binary files differ
diff --git a/shell/callbacks.c b/shell/callbacks.c
index 2bf1b961..d2f4c0d9 100644
--- a/shell/callbacks.c
+++ b/shell/callbacks.c
@@ -196,8 +196,8 @@ void cb_about()
"Ondrej Čerman",
"Mike Hewitt",
"Boris Afonot",
- "",
- "Based on work by:",
+ "",
+ "Based on work by:",
"uber-graph by Christian Hergert and others.",
"BinReloc by Hongli Lai",
"decode-dimms by Philip Edelbrock",
@@ -213,9 +213,18 @@ void cb_about()
"DMI support based on code by Stewart Adam",
"SCSI support based on code by Pascal F. Martin",
"",
- NULL
- };
- const gchar *artists[] = {
+ "Translated by:"
+ "Alexander Münch",
+ "micrococo",
+ "yolanteng0",
+ "Yunji Lee",
+ "Hugo Carvalho",
+ "Paulo Giovanni pereira",
+ "Sergey Rodin",
+ "Sabri Ünal",
+ "yetist",
+ "",
+ "Artwork by:"
"Jakub Szypulka",
"Tango Project",
"The GNOME Project",
@@ -256,9 +265,8 @@ void cb_about()
gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(about), TRUE);
gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about), authors);
- gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(about), artists);
- gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about),
- _("translator-credits"));
+ //gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(about), artists);
+ //gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about), _("translator-credits"));
gtk_dialog_run(GTK_DIALOG(about));
gtk_widget_destroy(about);
diff --git a/shell/menu.c b/shell/menu.c
index e0ed4038..d9084565 100644
--- a/shell/menu.c
+++ b/shell/menu.c
@@ -41,10 +41,10 @@
static GtkActionEntry entries[] = {
{"InformationMenuAction", NULL, N_("_Information")}, /* name, stock id, label */
- {"RemoteMenuAction", NULL, N_("_Remote")},
+ // {"RemoteMenuAction", NULL, N_("_Remote")},
{"ViewMenuAction", NULL, N_("_View")},
{"HelpMenuAction", NULL, N_("_Help")},
- {"HelpMenuModulesAction", HI_STOCK_ABOUT_MODULES, N_("About _Modules")},
+ // {"HelpMenuModulesAction", HI_STOCK_ABOUT_MODULES, N_("About _Modules")},
{"MainMenuBarAction", NULL, ""},
{"ReportAction", HI_STOCK_REPORT, /* name, stock id */
@@ -62,12 +62,12 @@ static GtkActionEntry entries[] = {
NULL,
G_CALLBACK(cb_sync_manager)},
- {"CopyAction", GTK_STOCK_COPY,
+ {"CopyAction", HI_STOCK_CLIPBOARD,
N_("_Copy to Clipboard"), "<control>C",
N_("Copy to clipboard"),
G_CALLBACK(cb_copy_to_clipboard)},
- {"RefreshAction", GTK_STOCK_REFRESH,
+ {"RefreshAction", HI_STOCK_REFRESH,
N_("_Refresh"), "F5",
NULL,
G_CALLBACK(cb_refresh)},
diff --git a/shell/shell.c b/shell/shell.c
index 07f208f0..166e7232 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -425,7 +425,7 @@ static void create_window(void)
gtk_window_set_icon(GTK_WINDOW(shell->window),
icon_cache_get_pixbuf("hardinfo.png"));
shell_set_title(shell, NULL);
- gtk_window_set_default_size(GTK_WINDOW(shell->window), 800, 600);
+ gtk_window_set_default_size(GTK_WINDOW(shell->window), 1024, 800);
g_signal_connect(G_OBJECT(shell->window), "destroy", destroy_me, NULL);
#if GTK_CHECK_VERSION(3, 0, 0)
@@ -518,7 +518,8 @@ static void menu_item_set_icon_always_visible(Shell *shell,
path = g_strdup_printf("%s/%s", parent_path, item_id);
menuitem = gtk_ui_manager_get_widget(shell->ui_manager, path);
- gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuitem), TRUE);
+
+ //gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(menuitem), TRUE);
g_free(path);
}
@@ -571,7 +572,8 @@ static void add_module_to_menu(gchar * name, GdkPixbuf * pixbuf)
merge_id = gtk_ui_manager_new_merge_id(shell->ui_manager);
gtk_ui_manager_add_ui(shell->ui_manager,
merge_id,
- "/menubar/HelpMenu/HelpMenuModules/LastSep",
+ // "/menubar/HelpMenu/HelpMenuModules/LastSep",
+ "/menubar/HelpMenu/LastSep",
about_module, about_module, GTK_UI_MANAGER_AUTO,
TRUE);
shell->merge_ids = g_slist_prepend(shell->merge_ids, GINT_TO_POINTER(merge_id));
@@ -641,7 +643,7 @@ void shell_add_modules_to_gui(gpointer _shell_module, gpointer _shell_tree)
-1);
}
- add_module_to_menu(module->name, module->icon);
+ //add_module_to_menu(module->name, module->icon);
if (module->entries) {
ShellModuleEntry *entry;
@@ -2365,12 +2367,21 @@ void key_get_components(const gchar *key,
if (*key == '$' && np) {
/* is flagged */
gchar *f = g_strdup(key);
- *(g_utf8_strchr(f+1, -1, '$') + 1) = 0;
- if (flags)
- *flags = g_strdup(f);
- if (tag)
- *tag = key_mi_tag(f);
- g_free(f);
+ gchar *s = g_utf8_strchr(f+1, -1, '$');
+ if(s==NULL) {
+ DEBUG("key_get_components_ERROR NOT FOUND");
+ }else{
+ if((s-f+1)>strlen(key)) {
+ DEBUG("key_get_components_ERROR NOT FOUND");
+ }else{
+ *(g_utf8_strchr(f+1, -1, '$') + 1) = 0;
+ if (flags)
+ *flags = g_strdup(f);
+ if (tag)
+ *tag = key_mi_tag(f);
+ g_free(f);
+ }
+ }
} else
np = key;
diff --git a/shell/stock.c b/shell/stock.c
index 3fe7cbdd..de5fc72c 100644
--- a/shell/stock.c
+++ b/shell/stock.c
@@ -25,11 +25,13 @@ static struct {
gchar *filename;
gchar *stock_id;
} stock_icons[] = {
+ { "clipboard.png", HI_STOCK_CLIPBOARD},
+ { "refresh.png", HI_STOCK_REFRESH},
{ "report.png", HI_STOCK_REPORT},
{ "internet.png", HI_STOCK_INTERNET},
{ "module.png", HI_STOCK_MODULE},
{ "about-modules.png", HI_STOCK_ABOUT_MODULES},
- { "syncmanager-small.png", HI_STOCK_SYNC_MENU},
+ { "server_sync.png", HI_STOCK_SYNC_MENU},
{ "face-grin.png", HI_STOCK_DONATE},
{ "server.png", HI_STOCK_SERVER},
};
diff --git a/shell/syncmanager.c b/shell/syncmanager.c
index 5d5176e3..e034909e 100644
--- a/shell/syncmanager.c
+++ b/shell/syncmanager.c
@@ -605,7 +605,7 @@ static SyncDialog *sync_dialog_new(GtkWidget *parent)
populate_store(store);
priv_policy_btn = gtk_link_button_new_with_label(
- "https://github.com/lpereira/hardinfo/wiki/Privacy-Policy",
+ "https://github.com/hwspeedy/hardinfo2?tab=readme-ov-file#privacy-policy",
_("Privacy Policy"));
gtk_widget_show(priv_policy_btn);
gtk_box_pack_start(GTK_BOX(dialog1_vbox), priv_policy_btn, FALSE, FALSE, 0);
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 20:36:08 +0000