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

app: more s/GDK_CONTROL_MASK/gimp_get_toggle_behavior_mask()/

This commit is contained in:
Michael Natterer 2011-10-07 00:51:17 +02:00
parent e2feb0c16f
commit e5edb1188d
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/widgets/gimpcolormapeditor.c
View File

@ -41,6 +41,7 @@
#include "gimppaletteview.h"
#include "gimpuimanager.h"
#include "gimpviewrendererpalette.h"
#include "gimpwidgets-utils.h"
#include "gimp-intl.h"
@ -229,7 +230,7 @@ gimp_colormap_editor_constructed (GObject *object)
gimp_editor_add_action_button (GIMP_EDITOR (editor), "colormap",
"colormap-add-color-from-fg",
"colormap-add-color-from-bg",
GDK_CONTROL_MASK,
gimp_get_toggle_behavior_mask (),
NULL);
}
@ -569,7 +570,7 @@ gimp_colormap_editor_entry_clicked (GimpPaletteView *view,
gimp_colormap_editor_set_index (editor, entry->position, NULL);
if (state & GDK_CONTROL_MASK)
if (state & gimp_get_toggle_behavior_mask ())
gimp_context_set_background (image_editor->context, &entry->color);
else
gimp_context_set_foreground (image_editor->context, &entry->color);

4
app/widgets/gimpdocumentview.c
View File

@ -101,7 +101,7 @@ gimp_document_view_new (GimpViewType view_type,
"documents-raise-or-open",
GDK_SHIFT_MASK,
"documents-file-open-dialog",
GDK_CONTROL_MASK,
gimp_get_toggle_behavior_mask (),
NULL);
gimp_container_view_enable_dnd (editor->view,
GTK_BUTTON (document_view->open_button),
@ -123,7 +123,7 @@ gimp_document_view_new (GimpViewType view_type,
"documents-reload-previews",
GDK_SHIFT_MASK,
"documents-remove-dangling",
GDK_CONTROL_MASK,
gimp_get_toggle_behavior_mask (),
NULL);
if (view_type == GIMP_VIEW_TYPE_LIST)

3
app/widgets/gimplayertreeview.c
View File

@ -56,6 +56,7 @@
#include "gimpuimanager.h"
#include "gimpviewrenderer.h"
#include "gimpwidgets-constructors.h"
#include "gimpwidgets-utils.h"
#include "gimp-intl.h"
@ -1358,7 +1359,7 @@ gimp_layer_tree_view_mask_clicked (GimpCellRendererViewable *cell,
if (state & GDK_MOD1_MASK)
gimp_action_group_set_action_active (group, "layers-mask-show",
! gimp_layer_mask_get_show (mask));
else if (state & GDK_CONTROL_MASK)
else if (state & gimp_get_toggle_behavior_mask ())
gimp_action_group_set_action_active (group, "layers-mask-disable",
gimp_layer_mask_get_apply (mask));
else if (! gimp_layer_mask_get_edit (mask))

4
app/widgets/gimppaletteeditor.c
View File

@ -259,7 +259,7 @@ gimp_palette_editor_constructed (GObject *object)
gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
"palette-editor-new-color-fg",
"palette-editor-new-color-bg",
GDK_CONTROL_MASK,
gimp_get_toggle_behavior_mask (),
NULL);
gimp_editor_add_action_button (GIMP_EDITOR (editor), "palette-editor",
@ -656,7 +656,7 @@ palette_editor_entry_clicked (GimpPaletteView *view,
{
GimpDataEditor *data_editor = GIMP_DATA_EDITOR (editor);
if (state & GDK_CONTROL_MASK)
if (state & gimp_get_toggle_behavior_mask ())
gimp_context_set_background (data_editor->context, &entry->color);
else
gimp_context_set_foreground (data_editor->context, &entry->color);