dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: add a "Playground" perfs page and a --show-playground command line option 

The page is shown by default in unstable but needs --show-playground
in stable versions. There is nothing yet on that page. Also, the icon
needs improvement...
This commit is contained in:
Michael Natterer 2014-09-14 01:08:25 +02:00
parent b19a18f80e
commit 0bf1f22b01
10 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/app.c
View File

@ -155,6 +155,7 @@ app_run (const gchar *full_prog_name,
gboolean use_cpu_accel,
gboolean console_messages,
gboolean use_debug_handler,
gboolean show_playground,
GimpStackTraceMode stack_trace_mode,
GimpPDBCompatMode pdb_compat_mode)
{
@ -197,6 +198,7 @@ app_run (const gchar *full_prog_name,
use_shm,
use_cpu_accel,
console_messages,
show_playground,
stack_trace_mode,
pdb_compat_mode);

1
app/app.h
View File

@ -47,6 +47,7 @@ void app_run (const gchar *full_prog_name,
gboolean use_cpu_accel,
gboolean console_messages,
gboolean use_debug_handler,
gboolean show_playground,
GimpStackTraceMode stack_trace_mode,
GimpPDBCompatMode pdb_compat_mode);

3
app/core/gimp.c
View File

@ -222,6 +222,7 @@ gimp_init (Gimp *gimp)
gimp->use_shm = FALSE;
gimp->use_cpu_accel = TRUE;
gimp->message_handler = GIMP_CONSOLE;
gimp->show_playground = FALSE;
gimp->stack_trace_mode = GIMP_STACK_TRACE_NEVER;
gimp->pdb_compat_mode = GIMP_PDB_COMPAT_OFF;
@ -802,6 +803,7 @@ gimp_new (const gchar *name,
gboolean use_shm,
gboolean use_cpu_accel,
gboolean console_messages,
gboolean show_playground,
GimpStackTraceMode stack_trace_mode,
GimpPDBCompatMode pdb_compat_mode)
{
@ -824,6 +826,7 @@ gimp_new (const gchar *name,
gimp->use_shm = use_shm ? TRUE : FALSE;
gimp->use_cpu_accel = use_cpu_accel ? TRUE : FALSE;
gimp->console_messages = console_messages ? TRUE : FALSE;
gimp->show_playground = show_playground ? TRUE : FALSE;
gimp->stack_trace_mode = stack_trace_mode;
gimp->pdb_compat_mode = pdb_compat_mode;

2
app/core/gimp.h
View File

@ -52,6 +52,7 @@ struct _Gimp
gboolean use_cpu_accel;
GimpMessageHandlerType message_handler;
gboolean console_messages;
gboolean show_playground;
GimpStackTraceMode stack_trace_mode;
GimpPDBCompatMode pdb_compat_mode;
@ -153,6 +154,7 @@ Gimp * gimp_new (const gchar *name,
gboolean use_shm,
gboolean use_cpu_accel,
gboolean console_messages,
gboolean show_playground,
GimpStackTraceMode stack_trace_mode,
GimpPDBCompatMode pdb_compat_mode);
void gimp_set_show_gui (Gimp *gimp,

26
app/dialogs/preferences-dialog.c
View File

@ -1451,6 +1451,32 @@ prefs_dialog_new (Gimp *gimp,
gimp);
/****************/
/* Playground */
/****************/
if (gimp->show_playground)
{
GtkWidget *label;
pixbuf = prefs_get_pixbufs (dialog, "playground", &small_pixbuf);
vbox = gimp_prefs_box_add_page (GIMP_PREFS_BOX (prefs_box),
_("Experimental Playground"),
pixbuf,
_("Playground"),
small_pixbuf,
GIMP_HELP_PREFS_DIALOG,
NULL,
&top_iter);
vbox2 = prefs_frame_new (_("Insane Options"),
GTK_CONTAINER (vbox), TRUE);
label = gtk_label_new ("Fuck Yeah!");
gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE, TRUE, 0);
gtk_widget_show (label);
}
/***********/
/* Theme */
/***********/

8
app/main.c
View File

@ -133,9 +133,11 @@ static gboolean console_messages = FALSE;
static gboolean use_debug_handler = FALSE;
#ifdef GIMP_UNSTABLE
static gboolean show_playground = TRUE;
static GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_QUERY;
static GimpPDBCompatMode pdb_compat_mode = GIMP_PDB_COMPAT_WARN;
#else
static gboolean show_playground = FALSE;
static GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_NEVER;
static GimpPDBCompatMode pdb_compat_mode = GIMP_PDB_COMPAT_ON;
#endif
@ -270,6 +272,11 @@ static const GOptionEntry main_entries[] =
G_OPTION_ARG_CALLBACK, gimp_option_dump_pdb_procedures_deprecated,
N_("Output a sorted list of deprecated procedures in the PDB"), NULL
},
{
"show-playground", 0, G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_NONE, &show_playground,
N_("Show a preferences page with experimental features"), NULL
},
{
G_OPTION_REMAINING, 0, 0,
G_OPTION_ARG_FILENAME_ARRAY, &filenames,
@ -466,6 +473,7 @@ main (int argc,
use_cpu_accel,
console_messages,
use_debug_handler,
show_playground,
stack_trace_mode,
pdb_compat_mode);

6
app/tests.c
View File

@ -66,7 +66,8 @@ gimp_init_for_testing (void)
gegl_init (NULL, NULL);
gimp = gimp_new ("Unit Tested GIMP", NULL, NULL, FALSE, TRUE, TRUE, TRUE,
FALSE, FALSE, TRUE, TRUE, FALSE);
FALSE, FALSE, TRUE, FALSE,
GIMP_STACK_TRACE_QUERY, GIMP_PDB_COMPAT_OFF);
units_init (gimp);
@ -123,7 +124,8 @@ gimp_init_for_gui_testing_internal (gboolean show_gui,
/* from app_run() */
gimp = gimp_new ("Unit Tested GIMP", NULL, NULL, FALSE, TRUE, TRUE, !show_gui,
FALSE, FALSE, TRUE, TRUE, FALSE);
FALSE, FALSE, TRUE, FALSE,
GIMP_STACK_TRACE_QUERY, GIMP_PDB_COMPAT_OFF);
gimp_set_show_gui (gimp, show_gui);
units_init (gimp);
gimp_load_config (gimp, gimprc, NULL);

BIN
icons/22/gimp-prefs-playground.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
icons/48/gimp-prefs-playground.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

2
icons/Makefile.am
View File

@ -260,6 +260,7 @@ icons22_DATA = \
22/gimp-prefs-input-devices.png \
22/gimp-prefs-interface.png \
22/gimp-prefs-new-image.png \
22/gimp-prefs-playground.png \
22/gimp-prefs-session.png \
22/gimp-prefs-theme.png \
22/gimp-prefs-tool-options.png \
@ -432,6 +433,7 @@ icons48_DATA = \
48/gimp-prefs-input-devices.png \
48/gimp-prefs-interface.png \
48/gimp-prefs-new-image.png \
48/gimp-prefs-playground.png \
48/gimp-prefs-session.png \
48/gimp-prefs-theme.png \
48/gimp-prefs-tool-options.png \