[gnome-commander/gcmd-1-10] Use define statement for static stock id
- From: Uwe Scholz <uwescholz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/gcmd-1-10] Use define statement for static stock id
- Date: Thu, 14 May 2020 20:50:07 +0000 (UTC)
commit 4e15e7bc546c4b25f35762a4706aeeaa647da975
Author: Uwe Scholz <u scholz83 gmx de>
Date: Thu May 14 21:37:23 2020 +0200
Use define statement for static stock id
src/gnome-cmd-main-win.cc | 4 ++--
src/imageloader.cc | 4 ++--
src/imageloader.h | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 546b13db..1f0ccd5c 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -235,14 +235,14 @@ static void create_toolbar (GnomeCmdMainWin *mw)
{ "Back", GTK_STOCK_GO_BACK, nullptr, nullptr, _("Go back"), (GCallback) view_back },
{ "Forward", GTK_STOCK_GO_FORWARD, nullptr, nullptr, _("Go forward"), (GCallback) view_forward },
{ "Latest", GTK_STOCK_GOTO_LAST, nullptr, nullptr, _("Go to the latest"), (GCallback) view_last },
- { "CopyFileNames", "my_stock_copy_file_names_xpm", nullptr, nullptr, _("Copy file names (SHIFT for
full paths, ALT for URIs)"), (GCallback) edit_copy_fnames },
+ { "CopyFileNames", COPYFILENAMES_STOCKID, nullptr, nullptr, _("Copy file names (SHIFT for full
paths, ALT for URIs)"), (GCallback) edit_copy_fnames },
{ "Cut", GTK_STOCK_CUT, nullptr, nullptr, _("Cut"), (GCallback) edit_cap_cut },
{ "Copy", GTK_STOCK_COPY, nullptr, nullptr, _("Copy"), (GCallback) edit_cap_copy },
{ "Paste", GTK_STOCK_PASTE, nullptr, nullptr, _("Paste"), (GCallback) edit_cap_paste },
{ "Delete", GTK_STOCK_DELETE, nullptr, nullptr, _("Delete"), (GCallback) file_delete },
{ "Edit", GTK_STOCK_EDIT,nullptr, nullptr, _("Edit (SHIFT for new document)"), (GCallback) file_edit
},
{ "Send", GTK_STOCK_EXECUTE, nullptr, nullptr, _("Send files"), (GCallback) file_sendto },
- { "Terminal", "my_stock_terminal_svg", nullptr, nullptr, _("Open terminal (SHIFT for root
privileges)"), (GCallback) command_open_terminal__internal },
+ { "Terminal", TERMINAL_STOCKID, nullptr, nullptr, _("Open terminal (SHIFT for root privileges)"),
(GCallback) command_open_terminal__internal },
{ "Remote", GTK_STOCK_CONNECT, nullptr, nullptr, _("Remote Server"), (GCallback) connections_open },
{ "Drop", nullptr, nullptr, nullptr, _("Drop connection"), (GCallback) connections_close_current }
};
diff --git a/src/imageloader.cc b/src/imageloader.cc
index 16e0cf8d..3c5d750d 100644
--- a/src/imageloader.cc
+++ b/src/imageloader.cc
@@ -496,8 +496,8 @@ static struct
const gchar *stock_id;
} stock_icons[] =
{
- { PIXMAPS_DIR G_DIR_SEPARATOR_S "copy_file_names.xpm", "gnome-commander-copy-file-names" },
- { PIXMAPS_DIR G_DIR_SEPARATOR_S "terminal.svg", "gnome-commander-terminal" }
+ { PIXMAPS_DIR G_DIR_SEPARATOR_S "copy_file_names.xpm", COPYFILENAMES_STOCKID },
+ { PIXMAPS_DIR G_DIR_SEPARATOR_S "terminal.svg", TERMINAL_STOCKID }
};
static gint n_stock_icons = G_N_ELEMENTS (stock_icons);
diff --git a/src/imageloader.h b/src/imageloader.h
index 904352d0..ab3e100e 100644
--- a/src/imageloader.h
+++ b/src/imageloader.h
@@ -1,4 +1,4 @@
-/**
+/**
* @file imageloader.h
* @copyright (C) 2001-2006 Marcus Bjurman\n
* @copyright (C) 2007-2012 Piotr Eljasiak\n
@@ -21,6 +21,9 @@
#pragma once
+#define COPYFILENAMES_STOCKID "gnome-commander-copy-file-names"
+#define TERMINAL_STOCKID "gnome-commander-terminal"
+
#include "gnome-cmd-pixmap.h"
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]