Project

General

Profile

Download (13.8 KB)

Feature #1288 » 1288-3_3+MainBetter.patch

Dean Brown, 06/03/2025 07:57 AM

View differences:

client/gui-gtk-3.22/optiondlg.c
static void option_dialog_destroy_callback(GtkWidget *object, gpointer data)
{
struct option_dialog *pdialog = (struct option_dialog *) data;
GtkWidget* cont_area;
GtkAllocation allocation;
int baseline;
/* Save size of the dialog. */
cont_area = gtk_dialog_get_content_area(GTK_DIALOG(pdialog->shell));
gtk_widget_get_allocated_size(GTK_WIDGET(cont_area),
&allocation, &baseline);
GUI_GTK_OPTION(optionsdlg_xsize) = allocation.width;
GUI_GTK_OPTION(optionsdlg_ysize) = allocation.height;
if (NULL != pdialog->shell) {
/* Mark as destroyed, see also option_dialog_destroy(). */
......
/* Shell */
setup_dialog(pdialog->shell, toplevel);
gtk_window_set_position(GTK_WINDOW(pdialog->shell), GTK_WIN_POS_MOUSE);
gtk_window_set_default_size(GTK_WINDOW(pdialog->shell), -1, 480);
gtk_window_set_default_size(GTK_WINDOW(pdialog->shell),
GUI_GTK_OPTION(optionsdlg_xsize),
GUI_GTK_OPTION(optionsdlg_ysize));
g_signal_connect(pdialog->shell, "response",
G_CALLBACK(option_dialog_reponse_callback), pdialog);
g_signal_connect(pdialog->shell, "destroy",
client/gui-gtk-4.0/gui_main.c
MIGRATE_OPTION(citydlg_ysize);
MIGRATE_OPTION(helpdlg_xsize);
MIGRATE_OPTION(helpdlg_ysize);
MIGRATE_OPTION(optionsdlg_xsize);
MIGRATE_OPTION(optionsdlg_ysize);
MIGRATE_OPTION(popup_tech_help);
MIGRATE_STR_OPTION(font_city_label);
client/gui-gtk-4.0/optiondlg.c
{
struct option_dialog *pdialog = (struct option_dialog *) data;
/* Save size of the dialog. */
gtk_window_get_default_size(GTK_WINDOW(object),
&GUI_GTK_OPTION(optionsdlg_xsize),
&GUI_GTK_OPTION(optionsdlg_ysize));
if (NULL != pdialog->shell) {
/* Mark as destroyed, see also option_dialog_destroy(). */
pdialog->shell = NULL;
......
/* Shell */
setup_dialog(pdialog->shell, toplevel);
gtk_window_set_default_size(GTK_WINDOW(pdialog->shell), -1, 480);
gtk_window_set_default_size(GTK_WINDOW(pdialog->shell),
GUI_GTK_OPTION(optionsdlg_xsize),
GUI_GTK_OPTION(optionsdlg_ysize));
g_signal_connect(pdialog->shell, "response",
G_CALLBACK(option_dialog_reponse_callback), pdialog);
g_signal_connect(pdialog->shell, "destroy",
client/gui-gtk-5.0/gui_main.c
MIGRATE_OPTION(citydlg_ysize);
MIGRATE_OPTION(helpdlg_xsize);
MIGRATE_OPTION(helpdlg_ysize);
MIGRATE_OPTION(optionsdlg_xsize);
MIGRATE_OPTION(optionsdlg_ysize);
MIGRATE_OPTION(popup_tech_help);
MIGRATE_STR_OPTION(font_city_label);
......
MIGRATE_OPTION(citydlg_ysize);
MIGRATE_OPTION(helpdlg_xsize);
MIGRATE_OPTION(helpdlg_ysize);
MIGRATE_OPTION(optionsdlg_xsize);
MIGRATE_OPTION(optionsdlg_ysize);
MIGRATE_OPTION(popup_tech_help);
MIGRATE_STR_OPTION(font_city_label);
client/gui-gtk-5.0/optiondlg.c
{
struct option_dialog *pdialog = (struct option_dialog *) data;
/* Save size of the dialog. */
gtk_window_get_default_size(GTK_WINDOW(object),
&GUI_GTK_OPTION(optionsdlg_xsize),
&GUI_GTK_OPTION(optionsdlg_ysize));
if (NULL != pdialog->shell) {
/* Mark as destroyed, see also option_dialog_destroy(). */
pdialog->shell = NULL;
......
/* Shell */
setup_dialog(pdialog->shell, toplevel);
gtk_window_set_default_size(GTK_WINDOW(pdialog->shell), -1, 480);
gtk_window_set_default_size(GTK_WINDOW(pdialog->shell),
GUI_GTK_OPTION(optionsdlg_xsize),
GUI_GTK_OPTION(optionsdlg_ysize));
g_signal_connect(pdialog->shell, "response",
G_CALLBACK(option_dialog_reponse_callback), pdialog);
g_signal_connect(pdialog->shell, "destroy",
client/options.c
.gui_gtk3_22_citydlg_ysize = GUI_GTK3_22_CITYDLG_DEFAULT_YSIZE,
.gui_gtk3_22_helpdlg_xsize = GUI_GTK3_22_HELPDLG_DEFAULT_XSIZE,
.gui_gtk3_22_helpdlg_ysize = GUI_GTK3_22_HELPDLG_DEFAULT_YSIZE,
.gui_gtk3_22_optionsdlg_xsize = GUI_GTK3_22_OPTIONSDLG_DEFAULT_XSIZE,
.gui_gtk3_22_optionsdlg_ysize = GUI_GTK3_22_OPTIONSDLG_DEFAULT_YSIZE,
.gui_gtk3_22_popup_tech_help = GUI_POPUP_TECH_HELP_RULESET,
.gui_gtk3_22_governor_range_min = -20,
.gui_gtk3_22_governor_range_max = 20,
......
.gui_gtk4_citydlg_ysize = GUI_GTK4_CITYDLG_DEFAULT_YSIZE,
.gui_gtk4_helpdlg_xsize = GUI_GTK4_HELPDLG_DEFAULT_XSIZE,
.gui_gtk4_helpdlg_ysize = GUI_GTK4_HELPDLG_DEFAULT_YSIZE,
.gui_gtk4_optionsdlg_ysize = GUI_GTK4_OPTIONSDLG_DEFAULT_YSIZE,
.gui_gtk4_optionsdlg_xsize = GUI_GTK4_OPTIONSDLG_DEFAULT_XSIZE,
.gui_gtk4_popup_tech_help = GUI_POPUP_TECH_HELP_RULESET,
.gui_gtk4_governor_range_min = -20,
.gui_gtk4_governor_range_max = 20,
......
.gui_gtk5_citydlg_ysize = GUI_GTK5_CITYDLG_DEFAULT_YSIZE,
.gui_gtk5_helpdlg_xsize = GUI_GTK5_HELPDLG_DEFAULT_XSIZE,
.gui_gtk5_helpdlg_ysize = GUI_GTK5_HELPDLG_DEFAULT_YSIZE,
.gui_gtk5_optionsdlg_xsize = GUI_GTK5_OPTIONSDLG_DEFAULT_XSIZE,
.gui_gtk5_optionsdlg_ysize = GUI_GTK5_OPTIONSDLG_DEFAULT_YSIZE,
.gui_gtk5_popup_tech_help = GUI_POPUP_TECH_HELP_RULESET,
.gui_gtk5_governor_range_min = -20,
.gui_gtk5_governor_range_max = 20,
......
COC_INTERFACE, GUI_GTK3_22, GUI_GTK3_22_HELPDLG_DEFAULT_YSIZE,
GUI_GTK3_22_HELPDLG_MIN_YSIZE, GUI_GTK3_22_HELPDLG_MAX_YSIZE,
NULL),
GEN_INT_OPTION(gui_gtk3_22_optionsdlg_xsize,
N_("Width of the options dialog"),
NULL,
COC_INTERFACE, GUI_GTK3_22, GUI_GTK3_22_OPTIONSDLG_DEFAULT_XSIZE,
GUI_GTK3_22_OPTIONSDLG_MIN_XSIZE, GUI_GTK3_22_OPTIONSDLG_MAX_XSIZE,
NULL),
GEN_INT_OPTION(gui_gtk3_22_optionsdlg_ysize,
N_("Height of the options dialog"),
NULL,
COC_INTERFACE, GUI_GTK3_22, GUI_GTK3_22_OPTIONSDLG_DEFAULT_YSIZE,
GUI_GTK3_22_OPTIONSDLG_MIN_YSIZE, GUI_GTK3_22_OPTIONSDLG_MAX_YSIZE,
NULL),
GEN_ENUM_OPTION(gui_gtk3_22_popup_tech_help,
N_("Popup tech help when gained"),
N_("Controls if tech help should be opened when "
......
COC_INTERFACE, GUI_GTK4, GUI_GTK4_HELPDLG_DEFAULT_YSIZE,
GUI_GTK4_HELPDLG_MIN_YSIZE, GUI_GTK4_HELPDLG_MAX_YSIZE,
NULL),
GEN_INT_OPTION(gui_gtk4_optionsdlg_xsize,
N_("Width of the options dialog"),
NULL,
COC_INTERFACE, GUI_GTK4, GUI_GTK4_OPTIONSDLG_DEFAULT_XSIZE,
GUI_GTK4_OPTIONSDLG_MIN_XSIZE, GUI_GTK4_OPTIONSDLG_MAX_XSIZE,
NULL),
GEN_INT_OPTION(gui_gtk4_optionsdlg_ysize,
N_("Height of the options dialog"),
NULL,
COC_INTERFACE, GUI_GTK4, GUI_GTK4_OPTIONSDLG_DEFAULT_YSIZE,
GUI_GTK4_OPTIONSDLG_MIN_YSIZE, GUI_GTK4_OPTIONSDLG_MAX_YSIZE,
NULL),
GEN_ENUM_OPTION(gui_gtk4_popup_tech_help,
N_("Popup tech help when gained"),
N_("Controls if tech help should be opened when "
......
COC_INTERFACE, GUI_GTK5, GUI_GTK5_HELPDLG_DEFAULT_YSIZE,
GUI_GTK5_HELPDLG_MIN_YSIZE, GUI_GTK5_HELPDLG_MAX_YSIZE,
NULL),
GEN_INT_OPTION(gui_gtk5_optionsdlg_xsize,
N_("Width of the options dialog"),
NULL,
COC_INTERFACE, GUI_GTK5, GUI_GTK5_OPTIONSDLG_DEFAULT_XSIZE,
GUI_GTK5_OPTIONSDLG_MIN_XSIZE, GUI_GTK5_OPTIONSDLG_MAX_XSIZE,
NULL),
GEN_INT_OPTION(gui_gtk5_optionsdlg_ysize,
N_("Height of the options dialog"),
NULL,
COC_INTERFACE, GUI_GTK5, GUI_GTK5_OPTIONSDLG_DEFAULT_YSIZE,
GUI_GTK5_OPTIONSDLG_MIN_YSIZE, GUI_GTK5_OPTIONSDLG_MAX_YSIZE,
NULL),
GEN_ENUM_OPTION(gui_gtk5_popup_tech_help,
N_("Popup tech help when gained"),
N_("Controls if tech help should be opened when "
client/options.h
int gui_gtk3_22_citydlg_ysize;
int gui_gtk3_22_helpdlg_xsize;
int gui_gtk3_22_helpdlg_ysize;
int gui_gtk3_22_optionsdlg_xsize;
int gui_gtk3_22_optionsdlg_ysize;
int gui_gtk3_22_popup_tech_help;
int gui_gtk3_22_governor_range_min;
int gui_gtk3_22_governor_range_max;
......
int gui_gtk4_citydlg_ysize;
int gui_gtk4_helpdlg_xsize;
int gui_gtk4_helpdlg_ysize;
int gui_gtk4_optionsdlg_xsize;
int gui_gtk4_optionsdlg_ysize;
int gui_gtk4_popup_tech_help;
int gui_gtk4_governor_range_min;
int gui_gtk4_governor_range_max;
......
int gui_gtk5_citydlg_ysize;
int gui_gtk5_helpdlg_xsize;
int gui_gtk5_helpdlg_ysize;
int gui_gtk5_optionsdlg_xsize;
int gui_gtk5_optionsdlg_ysize;
int gui_gtk5_popup_tech_help;
int gui_gtk5_governor_range_min;
int gui_gtk5_governor_range_max;
......
#define GUI_GTK3_22_HELPDLG_MIN_YSIZE 128
#define GUI_GTK3_22_HELPDLG_MAX_YSIZE 4096
/* gui-gtk3_22: [xy]size of the options dialog */
#define GUI_GTK3_22_OPTIONSDLG_DEFAULT_XSIZE 128
#define GUI_GTK3_22_OPTIONSDLG_MIN_XSIZE 128
#define GUI_GTK3_22_OPTIONSDLG_MAX_XSIZE 4096
#define GUI_GTK3_22_OPTIONSDLG_DEFAULT_YSIZE 400
#define GUI_GTK3_22_OPTIONSDLG_MIN_YSIZE 128
#define GUI_GTK3_22_OPTIONSDLG_MAX_YSIZE 4096
#define GUI_GTK3_22_GOV_RANGE_MIN_DEFAULT -20
#define GUI_GTK3_22_GOV_RANGE_MIN_MIN -100
#define GUI_GTK3_22_GOV_RANGE_MIN_MAX 0
......
#define GUI_GTK4_HELPDLG_MIN_YSIZE 128
#define GUI_GTK4_HELPDLG_MAX_YSIZE 4096
/* gui-gtk4: [xy]size of the options dialog */
#define GUI_GTK4_OPTIONSDLG_DEFAULT_XSIZE 128
#define GUI_GTK4_OPTIONSDLG_MIN_XSIZE 128
#define GUI_GTK4_OPTIONSDLG_MAX_XSIZE 4096
#define GUI_GTK4_OPTIONSDLG_DEFAULT_YSIZE 480
#define GUI_GTK4_OPTIONSDLG_MIN_YSIZE 128
#define GUI_GTK4_OPTIONSDLG_MAX_YSIZE 4096
#define GUI_GTK4_GOV_RANGE_MIN_DEFAULT -20
#define GUI_GTK4_GOV_RANGE_MIN_MIN -100
#define GUI_GTK4_GOV_RANGE_MIN_MAX 0
......
#define GUI_GTK5_HELPDLG_MIN_YSIZE 128
#define GUI_GTK5_HELPDLG_MAX_YSIZE 4096
/* gui-gtk5.0: [xy]size of the options dialog */
#define GUI_GTK5_OPTIONSDLG_DEFAULT_XSIZE 128
#define GUI_GTK5_OPTIONSDLG_MIN_XSIZE 128
#define GUI_GTK5_OPTIONSDLG_MAX_XSIZE 4096
#define GUI_GTK5_OPTIONSDLG_DEFAULT_YSIZE 480
#define GUI_GTK5_OPTIONSDLG_MIN_YSIZE 128
#define GUI_GTK5_OPTIONSDLG_MAX_YSIZE 4096
#define GUI_GTK5_GOV_RANGE_MIN_DEFAULT -20
#define GUI_GTK5_GOV_RANGE_MIN_MIN -100
#define GUI_GTK5_GOV_RANGE_MIN_MAX 0
(6-6/6)