Commit c6e26510 authored by Uwe Scholz's avatar Uwe Scholz

Use GtkUIManager instead of deprecated GnomeUIInfo for the internal viewer main menu

This work was done in several days of work. Unfortunatelly I had to
change so many things in parallel that it was not possible to create a
smaller commit.
parent dda7702b
......@@ -993,6 +993,13 @@
This option defines how many bytes should be displayed in one line in binary mode.
</description>
</key>
<key name="metadata-visible" type="b">
<default>true</default>
<summary>Metadata view</summary>
<description>
This option defines if metadata should be visible.
</description>
</key>
<key name="offset-x" type="i">
<default>20</default>
<summary>Horizontal offset</summary>
......
......@@ -218,6 +218,7 @@ GcmdSettings *gcmd_settings_new (void);
#define GCMD_SETTINGS_IV_FONT_SIZE "font-size"
#define GCMD_SETTINGS_IV_TAB_SIZE "tab-size"
#define GCMD_SETTINGS_IV_BINARY_BYTES_PER_LINE "binary-bytes-per-line"
#define GCMD_SETTINGS_IV_METADATA_VISIBLE "metadata-visible"
#define GCMD_SETTINGS_IV_X_OFFSET "offset-y"
#define GCMD_SETTINGS_IV_Y_OFFSET "offset-y"
#define GCMD_SETTINGS_IV_WINDOW_WIDTH "window-width"
......
/**
/**
* @file gnome-cmd-file.cc
* @copyright (C) 2001-2006 Marcus Bjurman\n
* @copyright (C) 2007-2012 Piotr Eljasiak\n
......
......@@ -496,10 +496,15 @@ static struct
const gchar *stock_id;
} stock_icons[] =
{
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "copy_file_names.xpm", COPYFILENAMES_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "exec_wheel.xpm", EXEC_WHEEL_STOCKID},
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "mail-send.png", MAILSEND_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "terminal.svg", TERMINAL_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "copy_file_names.xpm", COPYFILENAMES_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "exec_wheel.xpm", EXEC_WHEEL_STOCKID},
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "mail-send.png", MAILSEND_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "terminal.svg", TERMINAL_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "rotate-90-16.xpm", ROTATE_90_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "rotate-270-16.xpm", ROTATE_270_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "rotate-180-16.xpm", ROTATE_180_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "flip-vertical-16.xpm", FLIP_VERTICAL_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S "flip-horizontal-16.xpm", FLIP_HORIZONTAL_STOCKID },
{ PIXMAPS_DIR G_DIR_SEPARATOR_S FILETYPEICONS_FOLDER G_DIR_SEPARATOR_S "file_type_dir.xpm", FILETYPEDIR_STOCKID},
{ PIXMAPS_DIR G_DIR_SEPARATOR_S FILETYPEICONS_FOLDER G_DIR_SEPARATOR_S "file_type_regular.xpm", FILETYPEREGULARFILE_STOCKID},
};
......
......@@ -29,6 +29,11 @@
#define FILETYPEREGULARFILE_STOCKID "gnome-commander-file-type-regular-file"
#define MAILSEND_STOCKID "gnome-commander-mail-send"
#define TERMINAL_STOCKID "gnome-commander-terminal"
#define ROTATE_90_STOCKID "gnome-commander-rotate-90"
#define ROTATE_270_STOCKID "gnome-commander-rotate-270"
#define ROTATE_180_STOCKID "gnome-commander-rotate-180"
#define FLIP_VERTICAL_STOCKID "gnome-commander-flip-vertical"
#define FLIP_HORIZONTAL_STOCKID "gnome-commander-flip-horizontal"
#include "gnome-cmd-pixmap.h"
......
This diff is collapsed.
......@@ -75,6 +75,7 @@ struct GViewerWindowSettings
gboolean wrap_mode;
gboolean hex_decimal_offset;
gboolean metadata_visible;
};
......@@ -107,6 +108,8 @@ void gviewer_window_load_file (GViewerWindow *obj, GnomeCmdFile *f);
GtkWidget *gviewer_window_file_view (GnomeCmdFile *f, GViewerWindowSettings *initial_settings=NULL);
void gviewer_window_get_current_settings(GViewerWindow *obj, /* out */ GViewerWindowSettings *settings);
void gviewer_window_set_settings(GViewerWindow *obj, /*in*/ GViewerWindowSettings *settings);
GViewerWindowSettings *gviewer_window_get_settings();
void gviewer_window_load_settings(GViewerWindow *obj, /*in*/ GViewerWindowSettings *settings);
void gviewer_window_load_settings(/* out */ GViewerWindowSettings *settings);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment