Feature #943 » 943-S3_1+S3_2.patch
| client/gui-gtk-3.22/gui_main.c | ||
|---|---|---|
|
}
|
||
|
} else if (!(ev->state & GDK_CONTROL_MASK)) {
|
||
|
switch (ev->keyval) {
|
||
|
case GDK_KEY_plus:
|
||
|
case GDK_KEY_KP_Add:
|
||
|
zoom_step_up();
|
||
|
return TRUE;
|
||
|
case GDK_KEY_minus:
|
||
|
case GDK_KEY_KP_Subtract:
|
||
|
zoom_step_down();
|
||
|
return TRUE;
|
||
| client/gui-gtk-3.22/menu.c | ||
|---|---|---|
|
#include "mapview_common.h"
|
||
|
#include "options.h"
|
||
|
#include "tilespec.h"
|
||
|
#include "zoom.h"
|
||
|
/* client/gui-gtk-3.22 */
|
||
|
#include "chatline.h"
|
||
| ... | ... | |
|
static void scenario_properties_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void save_scenario_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void center_view_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void zoom_in_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void zoom_out_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void report_economy_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void report_research_callback(GtkMenuItem *item, gpointer data);
|
||
|
static void multiplier_callback(GtkMenuItem *item, gpointer data);
|
||
| ... | ... | |
|
{ "CENTER_VIEW", N_("_Center View"), GDK_KEY_c, 0,
|
||
|
G_CALLBACK(center_view_callback), MGROUP_PLAYER },
|
||
|
{ "ZOOM_IN", N_("_Zoom in"), GDK_KEY_plus, 0,
|
||
|
G_CALLBACK(zoom_in_callback), MGROUP_PLAYER },
|
||
|
{ "ZOOM_OUT", N_("_Zoom out"), GDK_KEY_minus, 0,
|
||
|
G_CALLBACK(zoom_out_callback), MGROUP_PLAYER },
|
||
|
{ "REPORT_ECONOMY", N_("_Economy"), GDK_KEY_F5, 0,
|
||
|
G_CALLBACK(report_economy_callback), MGROUP_PLAYER },
|
||
|
{ "REPORT_RESEARCH", N_("_Research"), GDK_KEY_F6, 0,
|
||
| ... | ... | |
|
center_on_unit();
|
||
|
}
|
||
|
/************************************************************************//**
|
||
|
Action "ZOOM_IN" callback.
|
||
|
****************************************************************************/
|
||
|
static void zoom_in_callback(GtkMenuItem *action, gpointer data)
|
||
|
{
|
||
|
zoom_step_up();
|
||
|
}
|
||
|
/************************************************************************//**
|
||
|
Action "ZOOM_OUT" callback.
|
||
|
****************************************************************************/
|
||
|
static void zoom_out_callback(GtkMenuItem *action, gpointer data)
|
||
|
{
|
||
|
zoom_step_down();
|
||
|
}
|
||
|
/************************************************************************//**
|
||
|
Action "REPORT_UNITS" callback.
|
||
|
****************************************************************************/
|
||
| client/gui-gtk-4.0/gui_main.c | ||
|---|---|---|
|
}
|
||
|
} else if (!(state & GDK_CONTROL_MASK)) {
|
||
|
switch (keyval) {
|
||
|
case GDK_KEY_plus:
|
||
|
case GDK_KEY_KP_Add:
|
||
|
zoom_step_up();
|
||
|
return TRUE;
|
||
|
case GDK_KEY_minus:
|
||
|
case GDK_KEY_KP_Subtract:
|
||
|
zoom_step_down();
|
||
|
return TRUE;
|
||
| client/gui-gtk-4.0/menu.c | ||
|---|---|---|
|
#include "mapview_common.h"
|
||
|
#include "options.h"
|
||
|
#include "tilespec.h"
|
||
|
#include "zoom.h"
|
||
|
/* client/gui-gtk-4.0 */
|
||
|
#include "chatline.h"
|
||
| ... | ... | |
|
static void center_view_callback(GSimpleAction *action,
|
||
|
GVariant *parameter,
|
||
|
gpointer data);
|
||
|
static void zoom_in_callback(GSimpleAction *action,
|
||
|
GVariant *parameter,
|
||
|
gpointer data);
|
||
|
static void zoom_out_callback(GSimpleAction *action,
|
||
|
GVariant *parameter,
|
||
|
gpointer data);
|
||
|
static void report_economy_callback(GSimpleAction *action,
|
||
|
GVariant *parameter,
|
||
|
gpointer data);
|
||
| ... | ... | |
|
{ "CENTER_VIEW", N_("_Center View"),
|
||
|
"center_view", "c", MGROUP_PLAYER,
|
||
|
NULL, FALSE },
|
||
|
{ "ZOOM_IN", N_("_Zoom in"),
|
||
|
"zoom_in", "plus", MGROUP_PLAYER,
|
||
|
NULL, FALSE },
|
||
|
{ "ZOOM_OUT", N_("_Zoom out"),
|
||
|
"zoom_out", "minus", MGROUP_PLAYER,
|
||
|
NULL, FALSE },
|
||
|
/* Select menu */
|
||
|
{ "SELECT_SINGLE", N_("_Single Unit (Unselect Others)"),
|
||
| ... | ... | |
|
{ "lua_script", client_lua_script_callback },
|
||
|
{ "center_view", center_view_callback },
|
||
|
{ "zoom_in", zoom_in_callback },
|
||
|
{ "zoom_out", zoom_out_callback },
|
||
|
{ "select_single", select_single_callback },
|
||
|
{ "select_all_tile", select_all_on_tile_callback },
|
||
| ... | ... | |
|
center_on_unit();
|
||
|
}
|
||
|
/************************************************************************//**
|
||
|
Action "ZOOM_IN" callback.
|
||
|
****************************************************************************/
|
||
|
static void zoom_in_callback(GSimpleAction *action,
|
||
|
GVariant *parameter,
|
||
|
gpointer data)
|
||
|
{
|
||
|
zoom_step_up();
|
||
|
}
|
||
|
/************************************************************************//**
|
||
|
Action "ZOOM_OUT" callback.
|
||
|
****************************************************************************/
|
||
|
static void zoom_out_callback(GSimpleAction *action,
|
||
|
GVariant *parameter,
|
||
|
gpointer data)
|
||
|
{
|
||
|
zoom_step_down();
|
||
|
}
|
||
|
/************************************************************************//**
|
||
|
Action "REPORT_UNITS" callback.
|
||
|
****************************************************************************/
|
||
| ... | ... | |
|
menu_entry_init(view_menu, "FULL_SCREEN");
|
||
|
menu_entry_init(view_menu, "CENTER_VIEW");
|
||
|
menu_entry_init(view_menu, "ZOOM_IN");
|
||
|
menu_entry_init(view_menu, "ZOOM_OUT");
|
||
|
submenu_append_unref(menubar, Q_("?verb:_View"), G_MENU_MODEL(view_menu));
|
||
| data/gtk3.22_menus.xml | ||
|---|---|---|
|
<child>
|
||
|
<object class="GtkMenuItem" id="CENTER_VIEW" />
|
||
|
</child>
|
||
|
<child>
|
||
|
<object class="GtkMenuItem" id="ZOOM_IN" />
|
||
|
</child>
|
||
|
<child>
|
||
|
<object class="GtkMenuItem" id="ZOOM_OUT" />
|
||
|
</child>
|
||
|
</object>
|
||
|
</child>
|
||
|
</object>
|
||