mirror of https://github.com/GNOME/gimp.git
Merge commit 'origin/master' into soc-2009-dynamics
This commit is contained in:
commit
11d6219776
|
@ -388,15 +388,19 @@ debug_dump_menus_recurse_menu (GtkWidget *menu,
|
|||
gint depth,
|
||||
gchar *path)
|
||||
{
|
||||
GList *children;
|
||||
GList *list;
|
||||
|
||||
for (list = GTK_MENU_SHELL (menu)->children; list; list = g_list_next (list))
|
||||
children = gtk_container_get_children (GTK_CONTAINER (menu));
|
||||
|
||||
for (list = children; list; list = g_list_next (list))
|
||||
{
|
||||
GtkWidget *menu_item = GTK_WIDGET (list->data);
|
||||
GtkWidget *child = gtk_bin_get_child (GTK_BIN (menu_item));
|
||||
|
||||
if (GTK_IS_LABEL (child))
|
||||
{
|
||||
GtkWidget *submenu;
|
||||
const gchar *label;
|
||||
gchar *full_path;
|
||||
gchar *help_page;
|
||||
|
@ -415,13 +419,16 @@ debug_dump_menus_recurse_menu (GtkWidget *menu,
|
|||
g_free (format_str);
|
||||
g_free (help_page);
|
||||
|
||||
if (GTK_MENU_ITEM (menu_item)->submenu)
|
||||
debug_dump_menus_recurse_menu (GTK_MENU_ITEM (menu_item)->submenu,
|
||||
depth + 1, full_path);
|
||||
submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item));
|
||||
|
||||
if (submenu)
|
||||
debug_dump_menus_recurse_menu (submenu, depth + 1, full_path);
|
||||
|
||||
g_free (full_path);
|
||||
}
|
||||
}
|
||||
|
||||
g_list_free (children);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -287,16 +287,17 @@ view_scroll_horizontal_cmd_callback (GtkAction *action,
|
|||
shell = gimp_display_get_shell (display);
|
||||
|
||||
offset = action_select_value ((GimpActionSelectType) value,
|
||||
shell->hsbdata->value,
|
||||
shell->hsbdata->lower,
|
||||
shell->hsbdata->upper -
|
||||
shell->hsbdata->page_size,
|
||||
shell->hsbdata->lower,
|
||||
gtk_adjustment_get_value (shell->hsbdata),
|
||||
gtk_adjustment_get_lower (shell->hsbdata),
|
||||
gtk_adjustment_get_upper (shell->hsbdata) -
|
||||
gtk_adjustment_get_page_size (shell->hsbdata),
|
||||
gtk_adjustment_get_lower (shell->hsbdata),
|
||||
1,
|
||||
shell->hsbdata->step_increment,
|
||||
shell->hsbdata->page_increment,
|
||||
gtk_adjustment_get_step_increment (shell->hsbdata),
|
||||
gtk_adjustment_get_page_increment (shell->hsbdata),
|
||||
0,
|
||||
FALSE);
|
||||
|
||||
gtk_adjustment_set_value (shell->hsbdata, offset);
|
||||
}
|
||||
|
||||
|
@ -313,16 +314,17 @@ view_scroll_vertical_cmd_callback (GtkAction *action,
|
|||
shell = gimp_display_get_shell (display);
|
||||
|
||||
offset = action_select_value ((GimpActionSelectType) value,
|
||||
shell->vsbdata->value,
|
||||
shell->vsbdata->lower,
|
||||
shell->vsbdata->upper -
|
||||
shell->vsbdata->page_size,
|
||||
shell->vsbdata->lower,
|
||||
gtk_adjustment_get_value (shell->vsbdata),
|
||||
gtk_adjustment_get_lower (shell->vsbdata),
|
||||
gtk_adjustment_get_upper (shell->vsbdata) -
|
||||
gtk_adjustment_get_page_size (shell->vsbdata),
|
||||
gtk_adjustment_get_lower (shell->vsbdata),
|
||||
1,
|
||||
shell->vsbdata->step_increment,
|
||||
shell->vsbdata->page_increment,
|
||||
gtk_adjustment_get_step_increment (shell->vsbdata),
|
||||
gtk_adjustment_get_page_increment (shell->vsbdata),
|
||||
0,
|
||||
FALSE);
|
||||
|
||||
gtk_adjustment_set_value (shell->vsbdata, offset);
|
||||
}
|
||||
|
||||
|
|
|
@ -44,11 +44,11 @@ window_close_cmd_callback (GtkAction *action,
|
|||
if (! GTK_WIDGET_TOPLEVEL (widget))
|
||||
widget = gtk_widget_get_toplevel (widget);
|
||||
|
||||
if (widget && widget->window)
|
||||
if (widget && gtk_widget_get_window (widget));
|
||||
{
|
||||
GdkEvent *event = gdk_event_new (GDK_DELETE);
|
||||
|
||||
event->any.window = g_object_ref (widget->window);
|
||||
event->any.window = g_object_ref (gtk_widget_get_window (widget));
|
||||
event->any.send_event = TRUE;
|
||||
|
||||
gtk_main_do_event (event);
|
||||
|
|
|
@ -295,7 +295,8 @@ about_dialog_anim_expose (GtkWidget *widget,
|
|||
gdk_region_destroy (covered_region);
|
||||
}
|
||||
|
||||
gdk_draw_layout (widget->window, text_gc, x, y, dialog->layout);
|
||||
gdk_draw_layout (gtk_widget_get_window (widget),
|
||||
text_gc, x, y, dialog->layout);
|
||||
|
||||
gdk_gc_set_clip_region (text_gc, NULL);
|
||||
|
||||
|
|
|
@ -171,7 +171,7 @@ file_open_dialog_response (GtkWidget *open_dialog,
|
|||
{
|
||||
success = TRUE;
|
||||
|
||||
gdk_window_raise (open_dialog->window);
|
||||
gdk_window_raise (gtk_widget_get_window (open_dialog));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
|
|||
|
||||
screen = gtk_widget_get_screen (dialog);
|
||||
monitor = gdk_screen_get_monitor_at_window (screen,
|
||||
resolution_entry->window);
|
||||
gtk_widget_get_window (resolution_entry));
|
||||
gdk_screen_get_monitor_geometry (screen, monitor, &rect);
|
||||
|
||||
ruler_width = rect.width - 300 - (rect.width % 100);
|
||||
|
|
|
@ -45,10 +45,7 @@
|
|||
#include "core/gimpmarshal.h"
|
||||
#include "core/gimptemplate.h"
|
||||
|
||||
#include "widgets/gimpactiongroup.h"
|
||||
#include "widgets/gimpdialogfactory.h"
|
||||
#include "widgets/gimphelp-ids.h"
|
||||
#include "widgets/gimpmenufactory.h"
|
||||
#include "widgets/gimpuimanager.h"
|
||||
#include "widgets/gimpwidgets-utils.h"
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ void gimp_image_window_add_shell (GimpImageWindow *windo
|
|||
void gimp_image_window_remove_shell (GimpImageWindow *window,
|
||||
GimpDisplayShell *shell);
|
||||
|
||||
gint gimp_image_window_get_n_shells (GimpImageWindow *window);
|
||||
gint gimp_image_window_get_n_shells (GimpImageWindow *window);
|
||||
|
||||
void gimp_image_window_set_active_shell (GimpImageWindow *window,
|
||||
GimpDisplayShell *shell);
|
||||
|
|
|
@ -242,11 +242,11 @@ gui_get_display_name (Gimp *gimp,
|
|||
|
||||
if (display)
|
||||
{
|
||||
GimpDisplayShell *shell = gimp_display_get_shell (display);
|
||||
GimpDisplayShell *shell = gimp_display_get_shell (display);
|
||||
GdkWindow *window = gtk_widget_get_window (GTK_WIDGET (shell));
|
||||
|
||||
screen = gtk_widget_get_screen (GTK_WIDGET (shell));
|
||||
monitor = gdk_screen_get_monitor_at_window (screen,
|
||||
GTK_WIDGET (shell)->window);
|
||||
monitor = gdk_screen_get_monitor_at_window (screen, window);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -168,19 +168,21 @@ splash_create (gboolean be_verbose)
|
|||
&values.foreground);
|
||||
|
||||
gtk_widget_realize (splash->area);
|
||||
splash->gc = gdk_gc_new_with_values (splash->area->window, &values,
|
||||
splash->gc = gdk_gc_new_with_values (gtk_widget_get_window (splash->area),
|
||||
&values,
|
||||
GDK_GC_FOREGROUND);
|
||||
|
||||
if (gdk_pixbuf_animation_is_static_image (pixbuf))
|
||||
{
|
||||
GdkPixmap *pixmap = gdk_pixmap_new (splash->area->window,
|
||||
GdkPixmap *pixmap = gdk_pixmap_new (gtk_widget_get_window (splash->area),
|
||||
splash->width, splash->height, -1);
|
||||
|
||||
gdk_draw_pixbuf (pixmap, splash->gc,
|
||||
gdk_pixbuf_animation_get_static_image (pixbuf),
|
||||
0, 0, 0, 0, splash->width, splash->height,
|
||||
GDK_RGB_DITHER_NORMAL, 0, 0);
|
||||
gdk_window_set_back_pixmap (splash->area->window, pixmap, FALSE);
|
||||
gdk_window_set_back_pixmap (gtk_widget_get_window (splash->area),
|
||||
pixmap, FALSE);
|
||||
g_object_unref (pixmap);
|
||||
}
|
||||
|
||||
|
@ -264,10 +266,10 @@ splash_area_expose (GtkWidget *widget,
|
|||
{
|
||||
gdk_gc_set_clip_region (splash->gc, event->region);
|
||||
|
||||
gdk_draw_layout (widget->window, splash->gc,
|
||||
gdk_draw_layout (gtk_widget_get_window (widget), splash->gc,
|
||||
splash->upper_x, splash->upper_y, splash->upper);
|
||||
|
||||
gdk_draw_layout (widget->window, splash->gc,
|
||||
gdk_draw_layout (gtk_widget_get_window (widget), splash->gc,
|
||||
splash->lower_x, splash->lower_y, splash->lower);
|
||||
|
||||
return FALSE;
|
||||
|
|
|
@ -480,7 +480,7 @@ gimp_draw_tool_draw_guide_line (GimpDrawTool *draw_tool,
|
|||
x1 = 0;
|
||||
y1 = 0;
|
||||
|
||||
gdk_drawable_get_size (shell->canvas->window, &x2, &y2);
|
||||
gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &x2, &y2);
|
||||
|
||||
switch (orientation)
|
||||
{
|
||||
|
|
|
@ -2250,11 +2250,12 @@ gimp_text_tool_editor (GimpTextTool *text_tool)
|
|||
static void
|
||||
gimp_text_tool_canvas_editor (GimpTextTool *text_tool)
|
||||
{
|
||||
GimpTool *tool = GIMP_TOOL (text_tool);
|
||||
GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
|
||||
GimpTool *tool = GIMP_TOOL (text_tool);
|
||||
GimpTextOptions *options = GIMP_TEXT_TOOL_GET_OPTIONS (text_tool);
|
||||
GimpDisplayShell *shell = gimp_display_get_shell (tool->display);
|
||||
|
||||
gtk_im_context_set_client_window (text_tool->im_context,
|
||||
gimp_display_get_shell (tool->display)->canvas->window);
|
||||
gtk_widget_get_window (shell->canvas));
|
||||
|
||||
gtk_im_context_focus_in (text_tool->im_context);
|
||||
|
||||
|
|
|
@ -246,7 +246,7 @@ gimp_toolbox_constructor (GType type,
|
|||
gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->p->tool_wbox), GTK_JUSTIFY_TOP);
|
||||
gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (toolbox->p->tool_wbox),
|
||||
GTK_JUSTIFY_LEFT);
|
||||
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (toolbox->p->tool_wbox), 2.0 / 15.0);
|
||||
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (toolbox->p->tool_wbox), 1.0 / 30.0);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->tool_wbox,
|
||||
FALSE, FALSE, 0);
|
||||
|
@ -256,7 +256,7 @@ gimp_toolbox_constructor (GType type,
|
|||
gtk_wrap_box_set_justify (GTK_WRAP_BOX (toolbox->p->area_wbox), GTK_JUSTIFY_TOP);
|
||||
gtk_wrap_box_set_line_justify (GTK_WRAP_BOX (toolbox->p->area_wbox),
|
||||
GTK_JUSTIFY_LEFT);
|
||||
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (toolbox->p->area_wbox), 2.0 / 15.0);
|
||||
gtk_wrap_box_set_aspect_ratio (GTK_WRAP_BOX (toolbox->p->area_wbox), 1.0 / 30.0);
|
||||
|
||||
gtk_box_pack_start (GTK_BOX (toolbox->p->vbox), toolbox->p->area_wbox,
|
||||
FALSE, FALSE, 0);
|
||||
|
|
|
@ -308,24 +308,27 @@ colorsel_cmyk_adj_update (GtkAdjustment *adj,
|
|||
{
|
||||
GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module);
|
||||
gint i;
|
||||
gdouble value;
|
||||
|
||||
for (i = 0; i < 4; i++)
|
||||
if (module->adj[i] == adj)
|
||||
break;
|
||||
|
||||
value = gtk_adjustment_get_value (adj) / 100.0;
|
||||
|
||||
switch (i)
|
||||
{
|
||||
case 0:
|
||||
module->cmyk.c = adj->value / 100.0;
|
||||
module->cmyk.c = value;
|
||||
break;
|
||||
case 1:
|
||||
module->cmyk.m = adj->value / 100.0;
|
||||
module->cmyk.m = value;
|
||||
break;
|
||||
case 2:
|
||||
module->cmyk.y = adj->value / 100.0;
|
||||
module->cmyk.y = value;
|
||||
break;
|
||||
case 3:
|
||||
module->cmyk.k = adj->value / 100.0;
|
||||
module->cmyk.k = value;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
|
@ -245,7 +245,7 @@ select_area_expose (GtkWidget *widget,
|
|||
dest += event->area.width * 3;
|
||||
}
|
||||
|
||||
gdk_draw_rgb_image_dithalign (widget->window,
|
||||
gdk_draw_rgb_image_dithalign (gtk_widget_get_window (widget),
|
||||
style->fg_gc[widget->state],
|
||||
event->area.x, event->area.y,
|
||||
event->area.width, event->area.height,
|
||||
|
@ -412,5 +412,6 @@ static void
|
|||
pressure_adjust_update (GtkAdjustment *adj,
|
||||
ColorselWater *water)
|
||||
{
|
||||
water->pressure_adjust = (adj->upper - adj->value) / 100.0;
|
||||
water->pressure_adjust = (gtk_adjustment_get_upper (adj) -
|
||||
gtk_adjustment_get_value (adj)) / 100.0;
|
||||
}
|
||||
|
|
|
@ -430,7 +430,8 @@ cdisplay_lcms_get_screen (CdisplayLcms *lcms,
|
|||
{
|
||||
GtkWidget *widget = GTK_WIDGET (managed);
|
||||
|
||||
*monitor = gdk_screen_get_monitor_at_window (screen, widget->window);
|
||||
*monitor = gdk_screen_get_monitor_at_window (screen,
|
||||
gtk_widget_get_window (widget));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -88,7 +88,7 @@ rcm_360_degrees (GtkWidget *button,
|
|||
circle->action_flag = DO_NOTHING;
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
circle->angle->beta = circle->angle->alpha-circle->angle->cw_ccw * 0.001;
|
||||
color_rotate_draw_arrows (circle->preview->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
circle->action_flag = VIRGIN;
|
||||
|
@ -123,7 +123,7 @@ rcm_a_to_b (GtkWidget *button,
|
|||
|
||||
SWAP (circle->angle->alpha, circle->angle->beta);
|
||||
|
||||
color_rotate_draw_arrows (circle->preview->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
|
||||
|
@ -142,10 +142,13 @@ rcm_spinbutton_to_degrees (GtkWidget *button,
|
|||
GtkAdjustment *adj;
|
||||
|
||||
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (button));
|
||||
adj->value = value * rcm_units_factor (Current.Units);
|
||||
adj->upper = 360.0;
|
||||
adj->step_increment = 0.01;
|
||||
adj->page_increment = 1.0;
|
||||
|
||||
gtk_adjustment_configure (adj,
|
||||
value * rcm_units_factor (Current.Units),
|
||||
gtk_adjustment_get_lower (adj), 360.0,
|
||||
0.01, 1.0,
|
||||
gtk_adjustment_get_page_size (adj));
|
||||
|
||||
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 2);
|
||||
|
||||
gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current.Units));
|
||||
|
@ -193,10 +196,13 @@ rcm_spinbutton_to_radians (GtkWidget *button,
|
|||
GtkAdjustment *adj;
|
||||
|
||||
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (button));
|
||||
adj->value = value * rcm_units_factor (Current.Units);
|
||||
adj->upper = TP;
|
||||
adj->step_increment = 0.0001;
|
||||
adj->page_increment = 0.001;
|
||||
|
||||
gtk_adjustment_configure (adj,
|
||||
value * rcm_units_factor (Current.Units),
|
||||
gtk_adjustment_get_lower (adj), TP,
|
||||
0.0001, 0.001,
|
||||
gtk_adjustment_get_page_size (adj));
|
||||
|
||||
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 4);
|
||||
|
||||
gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current.Units));
|
||||
|
@ -244,10 +250,13 @@ rcm_spinbutton_to_radians_over_PI (GtkWidget *button,
|
|||
GtkAdjustment *adj;
|
||||
|
||||
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (button));
|
||||
adj->value = value * rcm_units_factor (Current.Units);
|
||||
adj->upper = 2.0;
|
||||
adj->step_increment = 0.0001;
|
||||
adj->page_increment = 0.001;
|
||||
|
||||
gtk_adjustment_configure (adj,
|
||||
value * rcm_units_factor (Current.Units),
|
||||
gtk_adjustment_get_lower (adj), 2.0,
|
||||
0.0001, 0.001,
|
||||
gtk_adjustment_get_page_size (adj));
|
||||
|
||||
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 4);
|
||||
|
||||
gtk_label_set_text (GTK_LABEL (label), rcm_units_string (Current.Units));
|
||||
|
@ -355,7 +364,7 @@ rcm_expose_event (GtkWidget *widget,
|
|||
{
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
|
||||
color_rotate_draw_arrows (widget->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (widget),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
}
|
||||
|
@ -392,7 +401,7 @@ rcm_button_press_event (GtkWidget *widget,
|
|||
|
||||
*(circle->target) = clicked_angle;
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
color_rotate_draw_arrows (widget->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (widget),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
|
||||
|
@ -424,7 +433,7 @@ rcm_release_event (GtkWidget *widget,
|
|||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
color_rotate_draw_arrows (widget->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (widget),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
}
|
||||
|
@ -452,7 +461,7 @@ rcm_motion_notify_event (GtkWidget *widget,
|
|||
delta = angle_mod_2PI (cw_ccw * (*beta - *alpha));
|
||||
|
||||
values.function = GDK_INVERT;
|
||||
xor_gc = gdk_gc_new_with_values (Current.From->preview->window,
|
||||
xor_gc = gdk_gc_new_with_values (gtk_widget_get_window (Current.From->preview),
|
||||
&values,
|
||||
GDK_GC_FUNCTION);
|
||||
|
||||
|
@ -471,7 +480,8 @@ rcm_motion_notify_event (GtkWidget *widget,
|
|||
else
|
||||
{
|
||||
/* this should be erasing entire angle */
|
||||
color_rotate_draw_arrows (widget->window, xor_gc, circle->angle);
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (widget),
|
||||
xor_gc, circle->angle);
|
||||
}
|
||||
|
||||
if (circle->mode == EACH)
|
||||
|
@ -484,8 +494,9 @@ rcm_motion_notify_event (GtkWidget *widget,
|
|||
circle->angle->beta =angle_mod_2PI(circle->angle->beta + delta);
|
||||
}
|
||||
|
||||
gdk_window_process_updates (widget->window, FALSE);
|
||||
color_rotate_draw_arrows (widget->window, xor_gc, circle->angle);
|
||||
gdk_window_process_updates (gtk_widget_get_window (widget), FALSE);
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (widget),
|
||||
xor_gc, circle->angle);
|
||||
|
||||
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->alpha_entry),
|
||||
circle->angle->alpha *
|
||||
|
@ -514,13 +525,14 @@ rcm_gray_expose_event (GtkWidget *widget,
|
|||
{
|
||||
if (circle->action_flag == VIRGIN)
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
GdkWindow *window = gtk_widget_get_window (widget);
|
||||
|
||||
color_rotate_draw_little_circle (widget->window,
|
||||
color_rotate_draw_little_circle (window,
|
||||
style->black_gc,
|
||||
circle->hue, circle->satur);
|
||||
|
||||
color_rotate_draw_large_circle (widget->window,
|
||||
color_rotate_draw_large_circle (window,
|
||||
style->black_gc,
|
||||
circle->gray_sat);
|
||||
}
|
||||
|
@ -547,11 +559,11 @@ rcm_gray_button_press_event (GtkWidget *widget,
|
|||
circle->satur = 1;
|
||||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
color_rotate_draw_little_circle (widget->window,
|
||||
color_rotate_draw_little_circle (gtk_widget_get_window (widget),
|
||||
style->black_gc,
|
||||
circle->hue, circle->satur);
|
||||
|
||||
color_rotate_draw_large_circle (circle->preview->window,
|
||||
color_rotate_draw_large_circle (gtk_widget_get_window (circle->preview),
|
||||
gtk_widget_get_style (circle->preview)->black_gc,
|
||||
circle->gray_sat);
|
||||
|
||||
|
@ -576,7 +588,7 @@ rcm_gray_release_event (GtkWidget *widget,
|
|||
{
|
||||
GtkStyle *style = gtk_widget_get_style (widget);
|
||||
|
||||
color_rotate_draw_little_circle (widget->window,
|
||||
color_rotate_draw_little_circle (gtk_widget_get_window (widget),
|
||||
style->black_gc,
|
||||
circle->hue,
|
||||
circle->satur);
|
||||
|
@ -598,7 +610,7 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
GdkGCValues values;
|
||||
|
||||
values.function = GDK_INVERT;
|
||||
xor_gc = gdk_gc_new_with_values (Current.From->preview->window,
|
||||
xor_gc = gdk_gc_new_with_values (gtk_widget_get_window (Current.From->preview),
|
||||
&values,
|
||||
GDK_GC_FUNCTION);
|
||||
|
||||
|
@ -607,7 +619,7 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
GtkStyle *style = gtk_widget_get_style (circle->preview);
|
||||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
color_rotate_draw_large_circle (circle->preview->window,
|
||||
color_rotate_draw_large_circle (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->gray_sat);
|
||||
|
||||
|
@ -615,7 +627,7 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
}
|
||||
else
|
||||
{
|
||||
color_rotate_draw_little_circle (widget->window, xor_gc,
|
||||
color_rotate_draw_little_circle (gtk_widget_get_window (widget), xor_gc,
|
||||
circle->hue, circle->satur); /* erase */
|
||||
}
|
||||
|
||||
|
@ -628,7 +640,7 @@ rcm_gray_motion_notify_event (GtkWidget *widget,
|
|||
if (circle->satur > 1.0)
|
||||
circle->satur = 1;
|
||||
|
||||
color_rotate_draw_little_circle (widget->window, xor_gc,
|
||||
color_rotate_draw_little_circle (gtk_widget_get_window (widget), xor_gc,
|
||||
circle->hue, circle->satur);
|
||||
|
||||
gtk_spin_button_set_value (GTK_SPIN_BUTTON (circle->hue_entry),
|
||||
|
@ -662,7 +674,7 @@ rcm_set_alpha (GtkWidget *entry,
|
|||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
|
||||
color_rotate_draw_arrows (circle->preview->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
|
||||
|
@ -683,7 +695,7 @@ rcm_set_beta (GtkWidget *entry,
|
|||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
|
||||
color_rotate_draw_arrows (circle->preview->window,
|
||||
color_rotate_draw_arrows (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->angle);
|
||||
|
||||
|
@ -704,11 +716,11 @@ rcm_set_hue (GtkWidget *entry,
|
|||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
|
||||
color_rotate_draw_little_circle (circle->preview->window,
|
||||
color_rotate_draw_little_circle (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->hue, circle->satur);
|
||||
|
||||
color_rotate_draw_large_circle (circle->preview->window,
|
||||
color_rotate_draw_large_circle (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->gray_sat);
|
||||
|
||||
|
@ -728,11 +740,11 @@ rcm_set_satur (GtkWidget *entry,
|
|||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
|
||||
color_rotate_draw_little_circle (circle->preview->window,
|
||||
color_rotate_draw_little_circle (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->hue, circle->satur);
|
||||
|
||||
color_rotate_draw_large_circle (circle->preview->window,
|
||||
color_rotate_draw_large_circle (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->gray_sat);
|
||||
|
||||
|
@ -749,7 +761,7 @@ rcm_set_gray_sat (GtkWidget *entry,
|
|||
|
||||
gtk_widget_queue_draw (circle->preview);
|
||||
|
||||
color_rotate_draw_large_circle (circle->preview->window,
|
||||
color_rotate_draw_large_circle (gtk_widget_get_window (circle->preview),
|
||||
style->black_gc,
|
||||
circle->gray_sat);
|
||||
|
||||
|
|
|
@ -1371,7 +1371,7 @@ save_restart_update (GtkAdjustment *adjustment,
|
|||
GtkWidget *toggle)
|
||||
{
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)))
|
||||
jsvals.restart = adjustment->value;
|
||||
jsvals.restart = gtk_adjustment_get_value (adjustment);
|
||||
else
|
||||
jsvals.restart = 0;
|
||||
|
||||
|
|
|
@ -426,7 +426,7 @@ preview_leave_notify_event (GtkWidget *widget,
|
|||
|
||||
preview_redraw ();
|
||||
|
||||
gdk_window_set_cursor (maindlg->window, NULL);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (maindlg), NULL);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -445,7 +445,7 @@ preview_enter_notify_event (GtkWidget *widget,
|
|||
|
||||
}
|
||||
|
||||
gdk_window_set_cursor (maindlg->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (maindlg), cursor);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -1012,7 +1012,7 @@ explorer_dialog (void)
|
|||
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
toggle_vbox = GTK_BIN (frame)->child;
|
||||
toggle_vbox = gtk_bin_get_child (GTK_BIN (frame));
|
||||
|
||||
elements->redinvert = toggle =
|
||||
gtk_check_button_new_with_label (_("Inversion"));
|
||||
|
@ -1053,7 +1053,7 @@ explorer_dialog (void)
|
|||
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
toggle_vbox = GTK_BIN (frame)->child;
|
||||
toggle_vbox = gtk_bin_get_child (GTK_BIN (frame));
|
||||
|
||||
elements->greeninvert = toggle =
|
||||
gtk_check_button_new_with_label (_("Inversion"));
|
||||
|
@ -1094,7 +1094,7 @@ explorer_dialog (void)
|
|||
gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
|
||||
gtk_widget_show (frame);
|
||||
|
||||
toggle_vbox = GTK_BIN (frame)->child;
|
||||
toggle_vbox = gtk_bin_get_child (GTK_BIN (frame));
|
||||
|
||||
elements->blueinvert = toggle =
|
||||
gtk_check_button_new_with_label (_("Inversion"));
|
||||
|
|
|
@ -590,7 +590,7 @@ d_update_arc_line (GdkPoint *pnt)
|
|||
/* Draw square on point */
|
||||
draw_circle (&epnt->pnt, TRUE);
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
/*gfig_context->preview->style->bg_gc[GTK_STATE_NORMAL],*/
|
||||
gfig_gc,
|
||||
spnt->pnt.x,
|
||||
|
@ -606,7 +606,7 @@ d_update_arc_line (GdkPoint *pnt)
|
|||
|
||||
epnt = new_dobjpoint (pnt->x, pnt->y);
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
/*gfig_context->preview->style->bg_gc[GTK_STATE_NORMAL],*/
|
||||
gfig_gc,
|
||||
spnt->pnt.x,
|
||||
|
|
|
@ -177,7 +177,7 @@ d_update_circle (GdkPoint *pnt)
|
|||
draw_circle (&edge_pnt->pnt, TRUE);
|
||||
radius = calc_radius (¢er_pnt->pnt, &edge_pnt->pnt);
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
0,
|
||||
center_pnt->pnt.x - (gint) RINT (radius),
|
||||
|
@ -198,7 +198,7 @@ d_update_circle (GdkPoint *pnt)
|
|||
|
||||
radius = calc_radius (¢er_pnt->pnt, &edge_pnt->pnt);
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
0,
|
||||
center_pnt->pnt.x - (gint) RINT (radius),
|
||||
|
|
|
@ -786,7 +786,7 @@ draw_circle (GdkPoint *p,
|
|||
if (!selvals.opts.showcontrol)
|
||||
return;
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
selected,
|
||||
p->x - SQ_SIZE/2,
|
||||
|
@ -805,7 +805,7 @@ draw_sqr (GdkPoint *p,
|
|||
if (!selvals.opts.showcontrol)
|
||||
return;
|
||||
|
||||
gdk_draw_rectangle (gfig_context->preview->window,
|
||||
gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
selected,
|
||||
gfig_scale_x (p->x) - SQ_SIZE / 2,
|
||||
|
@ -2072,7 +2072,8 @@ toggle_obj_type (GtkRadioAction *action,
|
|||
p_cursors[selvals.otype] = gdk_cursor_new_for_display (display, ctype);
|
||||
}
|
||||
|
||||
gdk_window_set_cursor (gfig_context->preview->window, p_cursors[selvals.otype]);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (gfig_context->preview),
|
||||
p_cursors[selvals.otype]);
|
||||
}
|
||||
|
||||
/* This could belong in a separate file ... but makes it easier to lump into
|
||||
|
@ -2145,7 +2146,7 @@ void
|
|||
gfig_draw_arc (gint x, gint y, gint width, gint height, gint angle1,
|
||||
gint angle2)
|
||||
{
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
FALSE,
|
||||
gfig_scale_x (x - width),
|
||||
|
@ -2159,7 +2160,7 @@ gfig_draw_arc (gint x, gint y, gint width, gint height, gint angle1,
|
|||
void
|
||||
gfig_draw_line (gint x0, gint y0, gint x1, gint y1)
|
||||
{
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
gfig_scale_x (x0),
|
||||
gfig_scale_y (y0),
|
||||
|
@ -2173,7 +2174,7 @@ gfig_new_gc (void)
|
|||
GdkColor fg, bg;
|
||||
|
||||
/* create a new graphics context */
|
||||
gfig_gc = gdk_gc_new (gfig_context->preview->window);
|
||||
gfig_gc = gdk_gc_new (gtk_widget_get_window (gfig_context->preview));
|
||||
|
||||
gdk_gc_set_function (gfig_gc, GDK_INVERT);
|
||||
|
||||
|
|
|
@ -210,7 +210,7 @@ d_update_ellipse (GdkPoint *pnt)
|
|||
|
||||
draw_circle (&edge_pnt->pnt, TRUE);
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
0,
|
||||
top_x,
|
||||
|
@ -242,7 +242,7 @@ d_update_ellipse (GdkPoint *pnt)
|
|||
else
|
||||
top_y = edge_pnt->pnt.y;
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
0,
|
||||
top_x,
|
||||
|
|
|
@ -215,9 +215,9 @@ gfig_grid_colours (GtkWidget *widget)
|
|||
values.background.pixel = col1.pixel;
|
||||
values.foreground.pixel = col2.pixel;
|
||||
values.fill = GDK_OPAQUE_STIPPLED;
|
||||
values.stipple = gdk_bitmap_create_from_data (widget->window,
|
||||
values.stipple = gdk_bitmap_create_from_data (gtk_widget_get_window (widget),
|
||||
(gchar *) stipple, 4, 4);
|
||||
grid_hightlight_drawgc = gdk_gc_new_with_values (widget->window,
|
||||
grid_hightlight_drawgc = gdk_gc_new_with_values (gtk_widget_get_window (widget),
|
||||
&values,
|
||||
GDK_GC_FOREGROUND |
|
||||
GDK_GC_BACKGROUND |
|
||||
|
@ -407,7 +407,7 @@ draw_grid_polar (GdkGC *drawgc)
|
|||
gdouble t;
|
||||
gdouble sector_size = 2 * G_PI / current_sectors;
|
||||
|
||||
gdk_draw_arc (gfig_context->preview->window,
|
||||
gdk_draw_arc (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
0,
|
||||
0.5 + (preview_width / 2 - outer_radius),
|
||||
|
@ -430,7 +430,7 @@ draw_grid_polar (GdkGC *drawgc)
|
|||
gdouble normal_x = cos (selvals.opts.grid_rotation+t);
|
||||
gdouble normal_y = sin (selvals.opts.grid_rotation+t);
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
0.5 + (preview_width / 2 + inner_radius * normal_x),
|
||||
0.5 + (preview_height / 2 - inner_radius * normal_y),
|
||||
|
@ -454,7 +454,7 @@ draw_grid_sq (GdkGC *drawgc)
|
|||
|
||||
for (loop = 0 ; loop < preview_height ; loop += step)
|
||||
{
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
0,
|
||||
loop,
|
||||
|
@ -466,7 +466,7 @@ draw_grid_sq (GdkGC *drawgc)
|
|||
|
||||
for (loop = 0 ; loop < preview_width ; loop += step)
|
||||
{
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
loop,
|
||||
0,
|
||||
|
@ -492,14 +492,15 @@ draw_grid_iso (GdkGC *drawgc)
|
|||
hstep = selvals.opts.gridspacing * COS_1o6PI_RAD;
|
||||
|
||||
/* Draw the vertical lines - These are easy */
|
||||
for (loop = 0 ; loop < preview_width ; loop += hstep){
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
drawgc,
|
||||
(gint)loop,
|
||||
(gint)0,
|
||||
(gint)loop,
|
||||
(gint)preview_height);
|
||||
}
|
||||
for (loop = 0 ; loop < preview_width ; loop += hstep)
|
||||
{
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
(gint)loop,
|
||||
(gint)0,
|
||||
(gint)loop,
|
||||
(gint)preview_height);
|
||||
}
|
||||
|
||||
/* draw diag lines at a Theta of +/- 1/6 Pi Rad */
|
||||
|
||||
|
@ -514,14 +515,14 @@ draw_grid_iso (GdkGC *drawgc)
|
|||
/* Draw diag lines */
|
||||
for (loop = diagonal_start ; loop < diagonal_end ; loop += vstep)
|
||||
{
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
(gint)0,
|
||||
(gint)loop,
|
||||
(gint)diagonal_width,
|
||||
(gint)loop + diagonal_height);
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
drawgc,
|
||||
(gint)0,
|
||||
(gint)loop,
|
||||
|
|
|
@ -152,7 +152,7 @@ d_update_line (GdkPoint *pnt)
|
|||
/* Draw square on point */
|
||||
draw_circle (&epnt->pnt, TRUE);
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
spnt->pnt.x,
|
||||
spnt->pnt.y,
|
||||
|
@ -167,7 +167,7 @@ d_update_line (GdkPoint *pnt)
|
|||
|
||||
epnt = new_dobjpoint (pnt->x, pnt->y);
|
||||
|
||||
gdk_draw_line (gfig_context->preview->window,
|
||||
gdk_draw_line (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
spnt->pnt.x,
|
||||
spnt->pnt.y,
|
||||
|
|
|
@ -138,7 +138,7 @@ gfig_preview_realize (GtkWidget *widget)
|
|||
{
|
||||
GdkDisplay *display = gtk_widget_get_display (widget);
|
||||
|
||||
gdk_window_set_cursor (gfig_context->preview->window,
|
||||
gdk_window_set_cursor (gtk_widget_get_window (gfig_context->preview),
|
||||
gdk_cursor_new_for_display (display, GDK_CROSSHAIR));
|
||||
gfig_grid_colours (widget);
|
||||
}
|
||||
|
@ -152,8 +152,8 @@ draw_background (void)
|
|||
GIMP_PIXBUF_LARGE_CHECKS);
|
||||
|
||||
if (back_pixbuf)
|
||||
gdk_draw_pixbuf (gfig_context->preview->window,
|
||||
gfig_context->preview->style->fg_gc[GTK_STATE_NORMAL],
|
||||
gdk_draw_pixbuf (gtk_widget_get_window (gfig_context->preview),
|
||||
gtk_widget_get_style (gfig_context->preview)->fg_gc[GTK_STATE_NORMAL],
|
||||
back_pixbuf, 0, 0,
|
||||
0, 0,
|
||||
gdk_pixbuf_get_width (back_pixbuf),
|
||||
|
@ -165,7 +165,7 @@ gboolean
|
|||
gfig_preview_expose (GtkWidget *widget,
|
||||
GdkEvent *event)
|
||||
{
|
||||
gdk_window_clear (gfig_context->preview->window);
|
||||
gdk_window_clear (gtk_widget_get_window (gfig_context->preview));
|
||||
|
||||
if (gfig_context->show_background)
|
||||
draw_background ();
|
||||
|
|
|
@ -88,7 +88,8 @@ d_draw_rectangle (GfigObject *obj)
|
|||
gfig_scale_x (second_pnt->pnt.x));
|
||||
ymax = MAX (gfig_scale_y (first_pnt->pnt.y),
|
||||
gfig_scale_y (second_pnt->pnt.y));
|
||||
gdk_draw_rectangle (gfig_context->preview->window,
|
||||
|
||||
gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
FALSE,
|
||||
xmin, ymin,
|
||||
|
@ -199,7 +200,7 @@ d_update_rectangle (GdkPoint *pnt)
|
|||
gfig_scale_x (second_pnt->pnt.x));
|
||||
ymax = MAX (gfig_scale_y (first_pnt->pnt.y),
|
||||
gfig_scale_y (second_pnt->pnt.y));
|
||||
gdk_draw_rectangle (gfig_context->preview->window,
|
||||
gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc,
|
||||
FALSE,
|
||||
xmin, ymin, xmax - xmin, ymax - ymin);
|
||||
|
@ -222,7 +223,7 @@ d_update_rectangle (GdkPoint *pnt)
|
|||
gfig_scale_x (second_pnt->pnt.x));
|
||||
ymax = MAX (gfig_scale_y (first_pnt->pnt.y),
|
||||
gfig_scale_y (second_pnt->pnt.y));
|
||||
gdk_draw_rectangle (gfig_context->preview->window,
|
||||
gdk_draw_rectangle (gtk_widget_get_window (gfig_context->preview),
|
||||
gfig_gc, FALSE,
|
||||
xmin, ymin, xmax - xmin, ymax - ymin);
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ brush_restore (void)
|
|||
void
|
||||
brush_store (void)
|
||||
{
|
||||
pcvals.brushgamma = GTK_ADJUSTMENT (brush_gamma_adjust)->value;
|
||||
pcvals.brushgamma = gtk_adjustment_get_value (GTK_ADJUSTMENT (brush_gamma_adjust));
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -363,7 +363,7 @@ update_brush_preview (const gchar *fn)
|
|||
|
||||
set_colorbrushes (fn);
|
||||
|
||||
sc = GTK_ADJUSTMENT (brush_gamma_adjust)->value;
|
||||
sc = gtk_adjustment_get_value (GTK_ADJUSTMENT (brush_gamma_adjust));
|
||||
if (sc != 1.0)
|
||||
for (i = 0; i < 256; i++)
|
||||
gammatable[i] = pow (i / 255.0, sc) * 255;
|
||||
|
@ -372,7 +372,7 @@ update_brush_preview (const gchar *fn)
|
|||
gammatable[i] = i;
|
||||
|
||||
newheight = p.height *
|
||||
pow (10, GTK_ADJUSTMENT (brush_aspect_adjust)->value);
|
||||
pow (10, gtk_adjustment_get_value (GTK_ADJUSTMENT (brush_aspect_adjust)));
|
||||
|
||||
sc = p.width > newheight ? p.width : newheight;
|
||||
sc = 100.0 / sc;
|
||||
|
|
|
@ -62,13 +62,13 @@ void
|
|||
general_store (void)
|
||||
{
|
||||
pcvals.general_paint_edges = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_paint_edges));
|
||||
pcvals.general_dark_edge = GTK_ADJUSTMENT (general_dark_edge_adjust)->value;
|
||||
pcvals.general_dark_edge = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_dark_edge_adjust));
|
||||
pcvals.general_tileable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_tileable));
|
||||
pcvals.general_drop_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (general_drop_shadow));
|
||||
pcvals.general_shadow_darkness = GTK_ADJUSTMENT (general_shadow_adjust)->value;
|
||||
pcvals.general_shadow_depth = GTK_ADJUSTMENT (general_shadow_depth)->value;
|
||||
pcvals.general_shadow_blur = GTK_ADJUSTMENT (general_shadow_blur)->value;
|
||||
pcvals.devthresh = GTK_ADJUSTMENT (dev_thresh_adjust)->value;
|
||||
pcvals.general_shadow_darkness = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_shadow_adjust));
|
||||
pcvals.general_shadow_depth = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_shadow_depth));
|
||||
pcvals.general_shadow_blur = gtk_adjustment_get_value (GTK_ADJUSTMENT (general_shadow_blur));
|
||||
pcvals.devthresh = gtk_adjustment_get_value (GTK_ADJUSTMENT (dev_thresh_adjust));
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -80,8 +80,8 @@ double get_direction (double x, double y, int from)
|
|||
{
|
||||
n = num_vectors;
|
||||
vec = vector;
|
||||
angoff = GTK_ADJUSTMENT (angle_offset_adjust)->value;
|
||||
strexp = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value;
|
||||
angoff = gtk_adjustment_get_value (GTK_ADJUSTMENT (angle_offset_adjust));
|
||||
strexp = gtk_adjustment_get_value (GTK_ADJUSTMENT (orient_map_str_exp_adjust));
|
||||
voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (orient_voronoi));
|
||||
}
|
||||
else
|
||||
|
@ -225,7 +225,7 @@ update_vector_prev (void)
|
|||
guchar white[3] = {255, 255, 255};
|
||||
|
||||
if (vector_preview_brightness_adjust)
|
||||
val = 1.0 - GTK_ADJUSTMENT (vector_preview_brightness_adjust)->value / 100.0;
|
||||
val = 1.0 - gtk_adjustment_get_value (GTK_ADJUSTMENT (vector_preview_brightness_adjust)) / 100.0;
|
||||
else
|
||||
val = 0.5;
|
||||
|
||||
|
@ -390,7 +390,7 @@ angle_adjust_move_callback (GtkWidget *w, gpointer data)
|
|||
{
|
||||
if (adjignore)
|
||||
return;
|
||||
vector[selectedvector].dir = GTK_ADJUSTMENT (angle_adjust)->value;
|
||||
vector[selectedvector].dir = gtk_adjustment_get_value (GTK_ADJUSTMENT (angle_adjust));
|
||||
vector[selectedvector].dx =
|
||||
sin (gimp_deg_to_rad (vector[selectedvector].dir));
|
||||
vector[selectedvector].dy =
|
||||
|
@ -404,7 +404,7 @@ strength_adjust_move_callback (GtkWidget *w, gpointer data)
|
|||
{
|
||||
if (adjignore)
|
||||
return;
|
||||
vector[selectedvector].str = GTK_ADJUSTMENT (strength_adjust)->value;
|
||||
vector[selectedvector].str = gtk_adjustment_get_value (GTK_ADJUSTMENT (strength_adjust));
|
||||
update_vector_prev ();
|
||||
update_orient_map_preview_prev ();
|
||||
}
|
||||
|
@ -455,8 +455,8 @@ orient_map_response (GtkWidget *widget,
|
|||
pcvals.orient_vectors[i] = vector[i];
|
||||
|
||||
pcvals.num_orient_vectors = num_vectors;
|
||||
pcvals.orient_strength_exponent = GTK_ADJUSTMENT (orient_map_str_exp_adjust)->value;
|
||||
pcvals.orient_angle_offset = GTK_ADJUSTMENT (angle_offset_adjust)->value;
|
||||
pcvals.orient_strength_exponent = gtk_adjustment_get_value (GTK_ADJUSTMENT (orient_map_str_exp_adjust));
|
||||
pcvals.orient_angle_offset = gtk_adjustment_get_value (GTK_ADJUSTMENT (angle_offset_adjust));
|
||||
pcvals.orient_voronoi = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (orient_voronoi));
|
||||
}
|
||||
};
|
||||
|
|
|
@ -61,7 +61,7 @@ static double
|
|||
getsiz_from_gui (double x, double y)
|
||||
{
|
||||
return getsiz_proto (x,y, numsmvect, smvector,
|
||||
GTK_ADJUSTMENT (smstrexpadjust)->value,
|
||||
gtk_adjustment_get_value (GTK_ADJUSTMENT (smstrexpadjust)),
|
||||
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (size_voronoi)));
|
||||
}
|
||||
|
||||
|
@ -116,7 +116,7 @@ updatesmvectorprev (void)
|
|||
guchar white[3] = {255, 255, 255};
|
||||
|
||||
if (smvectprevbrightadjust)
|
||||
val = 1.0 - GTK_ADJUSTMENT (smvectprevbrightadjust)->value / 100.0;
|
||||
val = 1.0 - gtk_adjustment_get_value (GTK_ADJUSTMENT (smvectprevbrightadjust)) / 100.0;
|
||||
else
|
||||
val = 0.5;
|
||||
|
||||
|
@ -280,7 +280,7 @@ angsmadjmove (GtkWidget *w, gpointer data)
|
|||
{
|
||||
if (!smadjignore)
|
||||
{
|
||||
smvector[selectedsmvector].siz = GTK_ADJUSTMENT (sizadjust)->value;
|
||||
smvector[selectedsmvector].siz = gtk_adjustment_get_value (GTK_ADJUSTMENT (sizadjust));
|
||||
updatesmvectorprev ();
|
||||
updatesmpreviewprev ();
|
||||
}
|
||||
|
@ -291,7 +291,7 @@ strsmadjmove (GtkWidget *w, gpointer data)
|
|||
{
|
||||
if (!smadjignore)
|
||||
{
|
||||
smvector[selectedsmvector].str = GTK_ADJUSTMENT (smstradjust)->value;
|
||||
smvector[selectedsmvector].str = gtk_adjustment_get_value (GTK_ADJUSTMENT (smstradjust));
|
||||
updatesmvectorprev ();
|
||||
updatesmpreviewprev ();
|
||||
}
|
||||
|
|
|
@ -2541,7 +2541,7 @@ dlg_preview_realize (GtkWidget *widget)
|
|||
GdkDisplay *display = gtk_widget_get_display (widget);
|
||||
GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
|
||||
|
||||
gdk_window_set_cursor (widget->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
}
|
||||
|
||||
|
|
|
@ -173,8 +173,8 @@ gimp_throbber_construct_contents (GtkToolItem *tool_item)
|
|||
GtkWidget *image;
|
||||
GtkToolbarStyle style;
|
||||
|
||||
if (button->priv->image && button->priv->image->parent)
|
||||
gtk_container_remove (GTK_CONTAINER (button->priv->image->parent),
|
||||
if (button->priv->image && gtk_widget_get_parent (button->priv->image))
|
||||
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (button->priv->image)),
|
||||
button->priv->image);
|
||||
|
||||
if (gtk_bin_get_child (GTK_BIN (button->priv->button)))
|
||||
|
@ -339,8 +339,8 @@ gimp_throbber_set_image (GimpThrobber *button,
|
|||
{
|
||||
if (button->priv->image)
|
||||
{
|
||||
if (button->priv->image->parent)
|
||||
gtk_container_remove (GTK_CONTAINER (button->priv->image->parent),
|
||||
if (gtk_widget_get_parent (button->priv->image))
|
||||
gtk_container_remove (GTK_CONTAINER (gtk_widget_get_parent (button->priv->image)),
|
||||
button->priv->image);
|
||||
|
||||
g_object_unref (button->priv->image);
|
||||
|
|
|
@ -1490,7 +1490,7 @@ design_area_realize (GtkWidget *widget)
|
|||
GdkDisplay *display = gtk_widget_get_display (widget);
|
||||
GdkCursor *cursor = gdk_cursor_new_for_display (display,
|
||||
cursors[ifsDesign->op]);
|
||||
gdk_window_set_cursor (widget->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
}
|
||||
|
||||
|
@ -1505,7 +1505,7 @@ design_area_expose (GtkWidget *widget,
|
|||
|
||||
if (!ifsDesign->selected_gc)
|
||||
{
|
||||
ifsDesign->selected_gc = gdk_gc_new (ifsDesign->area->window);
|
||||
ifsDesign->selected_gc = gdk_gc_new (gtk_widget_get_window (ifsDesign->area));
|
||||
gdk_gc_set_line_attributes (ifsDesign->selected_gc, 2,
|
||||
GDK_LINE_SOLID, GDK_CAP_ROUND,
|
||||
GDK_JOIN_ROUND);
|
||||
|
@ -1544,7 +1544,7 @@ design_area_expose (GtkWidget *widget,
|
|||
|
||||
g_object_unref (layout);
|
||||
|
||||
gdk_draw_drawable (widget->window,
|
||||
gdk_draw_drawable (gtk_widget_get_window (widget),
|
||||
style->fg_gc[GTK_WIDGET_STATE (widget)],
|
||||
ifsDesign->pixmap,
|
||||
event->area.x, event->area.y,
|
||||
|
@ -1573,10 +1573,10 @@ design_area_configure (GtkWidget *widget,
|
|||
{
|
||||
g_object_unref (ifsDesign->pixmap);
|
||||
}
|
||||
ifsDesign->pixmap = gdk_pixmap_new (widget->window,
|
||||
widget->allocation.width,
|
||||
widget->allocation.height,
|
||||
-1); /* Is this correct? */
|
||||
ifsDesign->pixmap = gdk_pixmap_new (gtk_widget_get_window (widget),
|
||||
widget->allocation.width,
|
||||
widget->allocation.height,
|
||||
-1); /* Is this correct? */
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -2160,18 +2160,18 @@ value_pair_scale_callback (GtkAdjustment *adjustment,
|
|||
|
||||
if (value_pair->type == VALUE_PAIR_DOUBLE)
|
||||
{
|
||||
if ((gdouble) *value_pair->data.d != adjustment->value)
|
||||
if ((gdouble) *value_pair->data.d != gtk_adjustment_get_value (adjustment))
|
||||
{
|
||||
changed = TRUE;
|
||||
*value_pair->data.d = adjustment->value;
|
||||
*value_pair->data.d = gtk_adjustment_get_value (adjustment);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (*value_pair->data.i != (gint) adjustment->value)
|
||||
if (*value_pair->data.i != (gint) gtk_adjustment_get_value (adjustment))
|
||||
{
|
||||
changed = TRUE;
|
||||
*value_pair->data.i = adjustment->value;
|
||||
*value_pair->data.i = gtk_adjustment_get_value (adjustment);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -98,9 +98,10 @@ handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
|
|||
{
|
||||
gboolean success = FALSE;
|
||||
|
||||
if (data->length >= 0 && data->format == 8)
|
||||
if (gtk_selection_data_get_length (data) >= 0 &&
|
||||
gtk_selection_data_get_format (data) == 8)
|
||||
{
|
||||
const gchar *text = (const gchar *) data->data;
|
||||
const gchar *text = (const gchar *) gtk_selection_data_get_data (data);
|
||||
|
||||
if (g_utf8_validate (text, -1, NULL))
|
||||
{
|
||||
|
|
|
@ -123,9 +123,9 @@ button_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data)
|
|||
command->obj_x += dx;
|
||||
command->obj_y += dy;
|
||||
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
object_move(obj, dx, dy);
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -104,10 +104,10 @@ sash_move(GtkWidget *widget, GdkEventMotion *event, gpointer data)
|
|||
command->x = x;
|
||||
command->y = y;
|
||||
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
command->sash_func(obj, dx, dy);
|
||||
object_emit_geometry_signal(obj);
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -86,10 +86,10 @@ select_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data)
|
|||
gint x = get_real_coord((gint) event->x);
|
||||
gint y = get_real_coord((gint) event->y);
|
||||
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
rectangle->width = x - rectangle->x;
|
||||
rectangle->height = y - rectangle->y;
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -106,7 +106,7 @@ select_release(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
|||
g_signal_handlers_disconnect_by_func(widget,
|
||||
select_release, data);
|
||||
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
object_normalize(obj);
|
||||
gdk_gc_set_function(get_preferences()->normal_gc, GDK_COPY);
|
||||
|
||||
|
|
|
@ -358,7 +358,7 @@ draw_grid(GtkWidget *preview)
|
|||
|
||||
if (!grid_gc)
|
||||
{
|
||||
grid_gc = gdk_gc_new(preview->window);
|
||||
grid_gc = gdk_gc_new(gtk_widget_get_window (preview));
|
||||
|
||||
gdk_gc_set_line_attributes(grid_gc, 1, GDK_LINE_ON_OFF_DASH,
|
||||
GDK_CAP_BUTT, GDK_JOIN_BEVEL);
|
||||
|
@ -366,13 +366,13 @@ draw_grid(GtkWidget *preview)
|
|||
|
||||
if (grid_type == GRID_LINES)
|
||||
{
|
||||
draw_lines(preview->window, grid_gc, width, height);
|
||||
draw_lines(gtk_widget_get_window (preview), grid_gc, width, height);
|
||||
}
|
||||
else
|
||||
{
|
||||
GtkStyle *style = gtk_widget_get_style (preview);
|
||||
|
||||
draw_crosses(preview->window, style->black_gc, width,
|
||||
draw_crosses(gtk_widget_get_window (preview), style->black_gc, width,
|
||||
height);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -204,8 +204,8 @@ get_preferences(void)
|
|||
static void
|
||||
init_preferences(void)
|
||||
{
|
||||
GdkColormap *colormap = gdk_drawable_get_colormap(_dlg->window);
|
||||
ColorSelData_t *colors = &_preferences.colors;
|
||||
GdkColormap *colormap = gdk_drawable_get_colormap(gtk_widget_get_window (_dlg));
|
||||
ColorSelData_t *colors = &_preferences.colors;
|
||||
|
||||
colors->normal_fg.red = 0;
|
||||
colors->normal_fg.green = 0xFFFF;
|
||||
|
@ -230,8 +230,8 @@ init_preferences(void)
|
|||
gdk_colormap_alloc_color(colormap, &colors->selected_fg, FALSE, TRUE);
|
||||
gdk_colormap_alloc_color(colormap, &colors->selected_bg, FALSE, TRUE);
|
||||
|
||||
_preferences.normal_gc = gdk_gc_new(_preview->preview->window);
|
||||
_preferences.selected_gc = gdk_gc_new(_preview->preview->window);
|
||||
_preferences.normal_gc = gdk_gc_new(gtk_widget_get_window (_preview->preview));
|
||||
_preferences.selected_gc = gdk_gc_new(gtk_widget_get_window (_preview->preview));
|
||||
|
||||
gdk_gc_set_line_attributes(_preferences.normal_gc, 1, GDK_LINE_DOUBLE_DASH,
|
||||
GDK_CAP_BUTT, GDK_JOIN_BEVEL);
|
||||
|
@ -269,7 +269,7 @@ set_busy_cursor(void)
|
|||
void
|
||||
remove_busy_cursor(void)
|
||||
{
|
||||
gdk_window_set_cursor(_dlg->window, NULL);
|
||||
gdk_window_set_cursor(gtk_widget_get_window (_dlg), NULL);
|
||||
}
|
||||
|
||||
static gint
|
||||
|
@ -627,8 +627,8 @@ do_zoom_out(void)
|
|||
void
|
||||
draw_shapes(GtkWidget *preview)
|
||||
{
|
||||
if (!_preview_redraw_blocked)
|
||||
object_list_draw(_shapes, preview->window);
|
||||
if (!_preview_redraw_blocked)
|
||||
object_list_draw(_shapes, gtk_widget_get_window (preview));
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -1000,8 +1000,8 @@ preview_enter(GtkWidget *widget, GdkEventCrossing *event)
|
|||
static void
|
||||
preview_leave(GtkWidget *widget, GdkEventCrossing *event)
|
||||
{
|
||||
gdk_window_set_cursor(_dlg->window, NULL);
|
||||
statusbar_clear_xy(_statusbar);
|
||||
gdk_window_set_cursor(gtk_widget_get_window (_dlg), NULL);
|
||||
statusbar_clear_xy(_statusbar);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
@ -1029,9 +1029,9 @@ move_sash_selected_objects(gint dx, gint dy, gboolean fast)
|
|||
|
||||
gdk_gc_set_function(_preferences.normal_gc, GDK_XOR);
|
||||
gdk_gc_set_function(_preferences.selected_gc, GDK_XOR);
|
||||
object_list_draw_selected(_shapes, _preview->preview->window);
|
||||
object_list_draw_selected(_shapes, gtk_widget_get_window (_preview->preview));
|
||||
object_list_move_sash_selected(_shapes, dx, dy);
|
||||
object_list_draw_selected(_shapes, _preview->preview->window);
|
||||
object_list_draw_selected(_shapes, gtk_widget_get_window (_preview->preview));
|
||||
gdk_gc_set_function(_preferences.normal_gc, GDK_COPY);
|
||||
gdk_gc_set_function(_preferences.selected_gc, GDK_COPY);
|
||||
}
|
||||
|
@ -1048,9 +1048,9 @@ move_selected_objects(gint dx, gint dy, gboolean fast)
|
|||
|
||||
gdk_gc_set_function(_preferences.normal_gc, GDK_XOR);
|
||||
gdk_gc_set_function(_preferences.selected_gc, GDK_XOR);
|
||||
object_list_draw_selected(_shapes, _preview->preview->window);
|
||||
object_list_draw_selected(_shapes, gtk_widget_get_window (_preview->preview));
|
||||
object_list_move_selected(_shapes, dx, dy);
|
||||
object_list_draw_selected(_shapes, _preview->preview->window);
|
||||
object_list_draw_selected(_shapes, gtk_widget_get_window (_preview->preview));
|
||||
gdk_gc_set_function(_preferences.normal_gc, GDK_COPY);
|
||||
gdk_gc_set_function(_preferences.selected_gc, GDK_COPY);
|
||||
}
|
||||
|
|
|
@ -430,9 +430,9 @@ button_motion(GtkWidget *widget, GdkEventMotion *event,
|
|||
|
||||
round_to_grid(&x, &y);
|
||||
|
||||
object_draw(factory->obj, widget->window);
|
||||
object_draw(factory->obj, gtk_widget_get_window (widget));
|
||||
factory->set_xy(factory->obj, event->state, x, y);
|
||||
object_draw(factory->obj, widget->window);
|
||||
object_draw(factory->obj, gtk_widget_get_window (widget));
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
@ -462,15 +462,15 @@ object_on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
|||
if (preferences->prompt_for_area_info)
|
||||
object_edit(obj, FALSE);
|
||||
} else {
|
||||
object_draw(obj, widget->window);
|
||||
object_unref(obj);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
object_unref(obj);
|
||||
}
|
||||
gdk_gc_set_function(preferences->normal_gc, GDK_COPY);
|
||||
obj = NULL;
|
||||
main_clear_dimension();
|
||||
}
|
||||
} else if (event->button == 3) {
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
if (!factory->cancel || factory->cancel(event, obj)) {
|
||||
g_signal_handlers_disconnect_by_func(widget,
|
||||
button_motion,
|
||||
|
@ -480,7 +480,7 @@ object_on_button_press(GtkWidget *widget, GdkEventButton *event, gpointer data)
|
|||
obj = NULL;
|
||||
main_clear_dimension();
|
||||
} else {
|
||||
object_draw(obj, widget->window);
|
||||
object_draw(obj, gtk_widget_get_window (widget));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -360,7 +360,7 @@ preview_set_cursor(Preview_t *preview, GdkCursorType cursor_type)
|
|||
GdkCursor *cursor = gdk_cursor_new_for_display (display,
|
||||
cursor_type);
|
||||
|
||||
gdk_window_set_cursor(preview->window->window, cursor);
|
||||
gdk_window_set_cursor(gtk_widget_get_window (preview->window), cursor);
|
||||
gdk_cursor_unref(cursor);
|
||||
|
||||
preview->cursor = cursor_type;
|
||||
|
@ -378,22 +378,26 @@ static void
|
|||
handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
|
||||
GtkSelectionData *data, guint info, guint time)
|
||||
{
|
||||
gboolean success = FALSE;
|
||||
if (data->length >= 0 && data->format == 8) {
|
||||
gboolean success = FALSE;
|
||||
|
||||
if (gtk_selection_data_get_length (data) >= 0 &&
|
||||
gtk_selection_data_get_format (data) == 8)
|
||||
{
|
||||
ObjectList_t *list = get_shapes();
|
||||
Object_t *obj;
|
||||
|
||||
x = get_real_coord(x);
|
||||
y = get_real_coord(y);
|
||||
obj = object_list_find(list, x, y);
|
||||
if (obj && !obj->locked) {
|
||||
command_list_add(edit_object_command_new(obj));
|
||||
object_set_url(obj, (const gchar *) data->data);
|
||||
object_emit_update_signal(obj);
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
gtk_drag_finish(context, success, FALSE, time);
|
||||
if (obj && !obj->locked)
|
||||
{
|
||||
command_list_add(edit_object_command_new(obj));
|
||||
object_set_url(obj, (const gchar *) gtk_selection_data_get_data (data));
|
||||
object_emit_update_signal(obj);
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
gtk_drag_finish(context, success, FALSE, time);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -411,7 +415,10 @@ scroll_adj_changed (GtkAdjustment *adj,
|
|||
GimpRuler *ruler)
|
||||
{
|
||||
gimp_ruler_set_range (ruler,
|
||||
adj->value, adj->value + adj->page_size, adj->upper);
|
||||
gtk_adjustment_get_value (adj),
|
||||
gtk_adjustment_get_value (adj) +
|
||||
gtk_adjustment_get_page_size (adj),
|
||||
gtk_adjustment_get_upper (adj));
|
||||
}
|
||||
|
||||
Preview_t *
|
||||
|
|
|
@ -268,25 +268,33 @@ handle_drop(GtkWidget *widget, GdkDragContext *context, gint x, gint y,
|
|||
GtkSelectionData *data, guint info, guint time)
|
||||
{
|
||||
gboolean success = FALSE;
|
||||
if (data->length >= 0 && data->format == 8) {
|
||||
GtkTreePath *path;
|
||||
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), x, y,
|
||||
&path, NULL, NULL, NULL)) {
|
||||
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
|
||||
GtkTreeIter iter;
|
||||
|
||||
if (gtk_tree_model_get_iter (model, &iter, path)) {
|
||||
Object_t *obj = selection_get_object (model, &iter);
|
||||
if (!obj->locked) {
|
||||
command_list_add(edit_object_command_new (obj));
|
||||
object_set_url (obj, (const gchar *) data->data);
|
||||
object_emit_update_signal (obj);
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
gtk_tree_path_free (path);
|
||||
if (gtk_selection_data_get_length (data) >= 0 &&
|
||||
gtk_selection_data_get_format (data) == 8)
|
||||
{
|
||||
GtkTreePath *path;
|
||||
|
||||
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), x, y,
|
||||
&path, NULL, NULL, NULL))
|
||||
{
|
||||
GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
|
||||
GtkTreeIter iter;
|
||||
|
||||
if (gtk_tree_model_get_iter (model, &iter, path))
|
||||
{
|
||||
Object_t *obj = selection_get_object (model, &iter);
|
||||
|
||||
if (!obj->locked)
|
||||
{
|
||||
command_list_add(edit_object_command_new (obj));
|
||||
object_set_url (obj, (const gchar *) gtk_selection_data_get_data (data));
|
||||
object_emit_update_signal (obj);
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
gtk_tree_path_free (path);
|
||||
}
|
||||
}
|
||||
}
|
||||
gtk_drag_finish(context, success, FALSE, time);
|
||||
}
|
||||
|
||||
|
|
|
@ -308,7 +308,7 @@ draw_handles (void)
|
|||
if (backbuf.image != NULL)
|
||||
{
|
||||
gdk_gc_set_function (gc, GDK_COPY);
|
||||
gdk_draw_image (previewarea->window, gc,
|
||||
gdk_draw_image (gtk_widget_get_window (previewarea), gc,
|
||||
backbuf.image, 0, 0, backbuf.x,
|
||||
backbuf.y, backbuf.w, backbuf.h);
|
||||
g_object_unref (backbuf.image);
|
||||
|
@ -361,7 +361,7 @@ draw_handles (void)
|
|||
if ((backbuf.y + backbuf.h) > PREVIEW_HEIGHT)
|
||||
backbuf.h = (PREVIEW_HEIGHT - backbuf.y);
|
||||
|
||||
backbuf.image = gdk_drawable_get_image (previewarea->window,
|
||||
backbuf.image = gdk_drawable_get_image (gtk_widget_get_window (previewarea),
|
||||
backbuf.x, backbuf.y,
|
||||
backbuf.w, backbuf.h);
|
||||
}
|
||||
|
@ -381,19 +381,19 @@ draw_handles (void)
|
|||
{
|
||||
case POINT_LIGHT:
|
||||
case SPOT_LIGHT:
|
||||
gdk_draw_arc (previewarea->window, gc, TRUE,
|
||||
gdk_draw_arc (gtk_widget_get_window (previewarea), gc, TRUE,
|
||||
handle_xpos - LIGHT_SYMBOL_SIZE / 2,
|
||||
handle_ypos - LIGHT_SYMBOL_SIZE / 2,
|
||||
LIGHT_SYMBOL_SIZE,
|
||||
LIGHT_SYMBOL_SIZE, 0, 360 * 64);
|
||||
break;
|
||||
case DIRECTIONAL_LIGHT:
|
||||
gdk_draw_arc (previewarea->window, gc, TRUE,
|
||||
gdk_draw_arc (gtk_widget_get_window (previewarea), gc, TRUE,
|
||||
handle_xpos - LIGHT_SYMBOL_SIZE / 2,
|
||||
handle_ypos - LIGHT_SYMBOL_SIZE / 2,
|
||||
LIGHT_SYMBOL_SIZE,
|
||||
LIGHT_SYMBOL_SIZE, 0, 360 * 64);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
handle_xpos, handle_ypos, startx+pw/2 , starty + ph/2);
|
||||
break;
|
||||
case NO_LIGHT:
|
||||
|
@ -473,12 +473,12 @@ draw_preview_image (gboolean recompute)
|
|||
|
||||
cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
|
||||
|
||||
gdk_window_set_cursor (previewarea->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
|
||||
compute_preview (startx, starty, pw, ph);
|
||||
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
|
||||
gdk_window_set_cursor (previewarea->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
gdk_flush ();
|
||||
|
||||
|
@ -491,7 +491,7 @@ draw_preview_image (gboolean recompute)
|
|||
}
|
||||
}
|
||||
|
||||
gdk_draw_rgb_image (previewarea->window, gc,
|
||||
gdk_draw_rgb_image (gtk_widget_get_window (previewarea), gc,
|
||||
0, 0, PREVIEW_WIDTH, PREVIEW_HEIGHT,
|
||||
GDK_RGB_DITHER_MAX, preview_rgb_data,
|
||||
3 * PREVIEW_WIDTH);
|
||||
|
@ -519,7 +519,7 @@ preview_events (GtkWidget *area,
|
|||
/* =========================== */
|
||||
if (!gc)
|
||||
{
|
||||
gc = gdk_gc_new (area->window);
|
||||
gc = gdk_gc_new (gtk_widget_get_window (area));
|
||||
draw_preview_image (TRUE);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -1106,7 +1106,7 @@ main_dialog (GimpDrawable *drawable)
|
|||
|
||||
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
|
||||
GDK_HAND2);
|
||||
gdk_window_set_cursor (previewarea->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
}
|
||||
|
||||
|
|
|
@ -322,11 +322,11 @@ draw_light_marker (gint xpos,
|
|||
else if ((backbuf.y + backbuf.h) > PREVIEW_HEIGHT)
|
||||
backbuf.h = (PREVIEW_WIDTH - backbuf.y);
|
||||
|
||||
backbuf.image = gdk_drawable_get_image (previewarea->window,
|
||||
backbuf.image = gdk_drawable_get_image (gtk_widget_get_window (previewarea),
|
||||
backbuf.x, backbuf.y,
|
||||
backbuf.w, backbuf.h);
|
||||
|
||||
gdk_draw_arc (previewarea->window, gc,
|
||||
gdk_draw_arc (gtk_widget_get_window (previewarea), gc,
|
||||
TRUE,
|
||||
lightx - 7, lighty - 7, 14, 14,
|
||||
0, 360 * 64);
|
||||
|
@ -355,7 +355,7 @@ clear_light_marker (void)
|
|||
|
||||
gdk_gc_set_function (gc, GDK_COPY);
|
||||
|
||||
gdk_draw_image (previewarea->window, gc,
|
||||
gdk_draw_image (gtk_widget_get_window (previewarea), gc,
|
||||
backbuf.image,
|
||||
0, 0,
|
||||
backbuf.x, backbuf.y,
|
||||
|
@ -442,22 +442,22 @@ draw_preview_image (gint docompute)
|
|||
GdkCursor *cursor;
|
||||
|
||||
cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
|
||||
gdk_window_set_cursor (previewarea->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
|
||||
compute_preview (0, 0, width - 1, height - 1, pw, ph);
|
||||
|
||||
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
|
||||
gdk_window_set_cursor(previewarea->window, cursor);
|
||||
gdk_window_set_cursor(gtk_widget_get_window (previewarea), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
|
||||
clear_light_marker ();
|
||||
}
|
||||
|
||||
if (pw != PREVIEW_WIDTH || ph != PREVIEW_HEIGHT)
|
||||
gdk_window_clear (previewarea->window);
|
||||
gdk_window_clear (gtk_widget_get_window (previewarea));
|
||||
|
||||
gdk_draw_rgb_image (previewarea->window, gc,
|
||||
gdk_draw_rgb_image (gtk_widget_get_window (previewarea), gc,
|
||||
startx, starty, pw, ph,
|
||||
GDK_RGB_DITHER_MAX,
|
||||
preview_rgb_data, 3 * pw);
|
||||
|
@ -590,7 +590,7 @@ draw_wireframe_plane (gint startx,
|
|||
linetab[n].linestyle,
|
||||
GDK_CAP_NOT_LAST,
|
||||
GDK_JOIN_MITER);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
linetab[n].x1, linetab[n].y1,
|
||||
linetab[n].x2, linetab[n].y2);
|
||||
n++;
|
||||
|
@ -614,7 +614,7 @@ draw_wireframe_plane (gint startx,
|
|||
linetab[n].linestyle,
|
||||
GDK_CAP_NOT_LAST,
|
||||
GDK_JOIN_MITER);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
linetab[n].x1, linetab[n].y1,
|
||||
linetab[n].x2, linetab[n].y2);
|
||||
n++;
|
||||
|
@ -732,7 +732,7 @@ draw_wireframe_sphere (gint startx,
|
|||
linetab[n].linestyle,
|
||||
GDK_CAP_NOT_LAST,
|
||||
GDK_JOIN_MITER);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
linetab[n].x1, linetab[n].y1,
|
||||
linetab[n].x2, linetab[n].y2);
|
||||
n++;
|
||||
|
@ -773,7 +773,7 @@ draw_wireframe_sphere (gint startx,
|
|||
linetab[n].linestyle,
|
||||
GDK_CAP_NOT_LAST,
|
||||
GDK_JOIN_MITER);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
linetab[n].x1, linetab[n].y1,
|
||||
linetab[n].x2, linetab[n].y2);
|
||||
n++;
|
||||
|
@ -822,7 +822,7 @@ draw_line (gint n,
|
|||
linetab[i].linestyle,
|
||||
GDK_CAP_NOT_LAST,
|
||||
GDK_JOIN_MITER);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
linetab[i].x1, linetab[i].y1,
|
||||
linetab[i].x2, linetab[i].y2);
|
||||
i++;
|
||||
|
@ -982,7 +982,7 @@ clear_wireframe (void)
|
|||
linetab[n].linestyle,
|
||||
GDK_CAP_NOT_LAST,
|
||||
GDK_JOIN_MITER);
|
||||
gdk_draw_line (previewarea->window, gc,
|
||||
gdk_draw_line (gtk_widget_get_window (previewarea), gc,
|
||||
linetab[n].x1, linetab[n].y1,
|
||||
linetab[n].x2, linetab[n].y2);
|
||||
n++;
|
||||
|
|
|
@ -202,6 +202,9 @@ static void
|
|||
mapmenu_callback (GtkWidget *widget,
|
||||
gpointer data)
|
||||
{
|
||||
GList *children;
|
||||
gint n_children;
|
||||
|
||||
gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), (gint *) data);
|
||||
|
||||
draw_preview_image (TRUE);
|
||||
|
@ -230,13 +233,15 @@ mapmenu_callback (GtkWidget *widget,
|
|||
linetab[0].x1 = -1;
|
||||
}
|
||||
|
||||
children = gtk_container_get_children (GTK_CONTAINER (options_note_book));
|
||||
n_children = g_list_length (children);
|
||||
g_list_free (children);
|
||||
|
||||
if (mapvals.maptype == MAP_BOX)
|
||||
{
|
||||
if (cylinder_page != NULL)
|
||||
{
|
||||
gtk_notebook_remove_page
|
||||
(options_note_book,
|
||||
g_list_length (options_note_book->children) - 1);
|
||||
gtk_notebook_remove_page (options_note_book, n_children - 1);
|
||||
cylinder_page = NULL;
|
||||
}
|
||||
|
||||
|
@ -252,9 +257,7 @@ mapmenu_callback (GtkWidget *widget,
|
|||
{
|
||||
if (box_page != NULL)
|
||||
{
|
||||
gtk_notebook_remove_page
|
||||
(options_note_book,
|
||||
g_list_length (options_note_book->children) - 1);
|
||||
gtk_notebook_remove_page (options_note_book, n_children - 1);
|
||||
box_page = NULL;
|
||||
}
|
||||
|
||||
|
@ -270,16 +273,13 @@ mapmenu_callback (GtkWidget *widget,
|
|||
{
|
||||
if (box_page != NULL)
|
||||
{
|
||||
gtk_notebook_remove_page
|
||||
(options_note_book,
|
||||
g_list_length (options_note_book->children) - 1);
|
||||
gtk_notebook_remove_page (options_note_book, n_children - 1);
|
||||
n_children--;
|
||||
}
|
||||
|
||||
if (cylinder_page != NULL)
|
||||
{
|
||||
gtk_notebook_remove_page
|
||||
(options_note_book,
|
||||
g_list_length (options_note_book->children) - 1);
|
||||
gtk_notebook_remove_page (options_note_book, n_children - 1);
|
||||
}
|
||||
|
||||
box_page = NULL;
|
||||
|
@ -360,7 +360,7 @@ preview_events (GtkWidget *area,
|
|||
|
||||
if (!gc)
|
||||
{
|
||||
gc = gdk_gc_new (area->window);
|
||||
gc = gdk_gc_new (gtk_widget_get_window (area));
|
||||
draw_preview_image (TRUE);
|
||||
}
|
||||
else
|
||||
|
@ -1434,7 +1434,7 @@ main_dialog (GimpDrawable *drawable)
|
|||
|
||||
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (previewarea),
|
||||
GDK_HAND2);
|
||||
gdk_window_set_cursor (previewarea->window, cursor);
|
||||
gdk_window_set_cursor (gtk_widget_get_window (previewarea), cursor);
|
||||
gdk_cursor_unref (cursor);
|
||||
}
|
||||
|
||||
|
|
|
@ -655,7 +655,7 @@ entscale_int_scale_update (GtkAdjustment *adjustment,
|
|||
|
||||
userdata = g_object_get_data (G_OBJECT (adjustment), "userdata");
|
||||
|
||||
new_val = (gint) adjustment->value;
|
||||
new_val = (gint) gtk_adjustment_get_value (adjustment);
|
||||
|
||||
*intvar = new_val;
|
||||
|
||||
|
@ -691,23 +691,23 @@ entscale_int_entry_update (GtkWidget *widget,
|
|||
|
||||
new_val = atoi (gtk_entry_get_text (GTK_ENTRY (widget)));
|
||||
constraint_val = new_val;
|
||||
if ( constraint_val < adjustment->lower )
|
||||
constraint_val = adjustment->lower;
|
||||
if ( constraint_val > adjustment->upper )
|
||||
constraint_val = adjustment->upper;
|
||||
|
||||
if (constraint_val < gtk_adjustment_get_lower (adjustment))
|
||||
constraint_val = gtk_adjustment_get_lower (adjustment);
|
||||
|
||||
if (constraint_val > gtk_adjustment_get_upper (adjustment))
|
||||
constraint_val = gtk_adjustment_get_upper (adjustment);
|
||||
|
||||
if ( userdata->constraint )
|
||||
*intvar = constraint_val;
|
||||
else
|
||||
*intvar = new_val;
|
||||
|
||||
adjustment->value = constraint_val;
|
||||
|
||||
g_signal_handlers_block_by_func (adjustment,
|
||||
entscale_int_scale_update,
|
||||
data);
|
||||
|
||||
gtk_adjustment_value_changed (adjustment);
|
||||
gtk_adjustment_set_value (adjustment, constraint_val);
|
||||
|
||||
g_signal_handlers_unblock_by_func (adjustment,
|
||||
entscale_int_scale_update,
|
||||
|
|
|
@ -392,7 +392,7 @@ static void
|
|||
dialog_scale_update (GtkAdjustment *adjustment,
|
||||
gdouble *value)
|
||||
{
|
||||
*value = ((gdouble) adjustment->value) / 100.0;
|
||||
*value = ((gdouble) gtk_adjustment_get_value (adjustment)) / 100.0;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -708,7 +708,9 @@ print_size_info_offset_max_changed (GtkAdjustment *adj,
|
|||
g_signal_handlers_block_by_func (info.size_entry,
|
||||
print_size_info_size_changed, NULL);
|
||||
|
||||
gimp_size_entry_set_value (info.size_entry, index, adj->upper - adj->value);
|
||||
gimp_size_entry_set_value (info.size_entry, index,
|
||||
gtk_adjustment_get_upper (adj) -
|
||||
gtk_adjustment_get_value (adj));
|
||||
|
||||
g_signal_handlers_unblock_by_func (info.size_entry,
|
||||
print_size_info_size_changed, NULL);
|
||||
|
|
|
@ -258,7 +258,9 @@ print_preview_size_request (GtkWidget *widget,
|
|||
PrintPreview *preview = PRINT_PREVIEW (widget);
|
||||
gdouble paper_width;
|
||||
gdouble paper_height;
|
||||
gint border = GTK_CONTAINER (widget)->border_width + 1;
|
||||
gint border;
|
||||
|
||||
border = gtk_container_get_border_width (GTK_CONTAINER (widget)) + 1;
|
||||
|
||||
print_preview_get_page_size (preview, &paper_width, &paper_height);
|
||||
|
||||
|
@ -415,7 +417,9 @@ print_preview_expose_event (GtkWidget *widget,
|
|||
gdouble top_margin;
|
||||
gdouble bottom_margin;
|
||||
gdouble scale;
|
||||
gint border = GTK_CONTAINER (widget)->border_width + 1;
|
||||
gint border;
|
||||
|
||||
border = gtk_container_get_border_width (GTK_CONTAINER (widget)) + 1;
|
||||
|
||||
print_preview_get_page_size (preview, &paper_width, &paper_height);
|
||||
print_preview_get_page_margins (preview,
|
||||
|
@ -424,7 +428,7 @@ print_preview_expose_event (GtkWidget *widget,
|
|||
|
||||
scale = print_preview_get_scale (preview);
|
||||
|
||||
cr = gdk_cairo_create (widget->window);
|
||||
cr = gdk_cairo_create (gtk_widget_get_window (widget));
|
||||
|
||||
cairo_translate (cr,
|
||||
widget->allocation.x + border,
|
||||
|
@ -659,7 +663,9 @@ print_preview_is_inside (PrintPreview *preview,
|
|||
gdouble top_margin;
|
||||
gdouble bottom_margin;
|
||||
gdouble scale;
|
||||
gint border = GTK_CONTAINER (widget)->border_width + 1;
|
||||
gint border;
|
||||
|
||||
border = gtk_container_get_border_width (GTK_CONTAINER (widget)) + 1;
|
||||
|
||||
x -= border;
|
||||
|
||||
|
@ -700,7 +706,7 @@ print_preview_set_inside (PrintPreview *preview,
|
|||
preview->inside = inside;
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (widget))
|
||||
gdk_window_set_cursor (widget->window,
|
||||
gdk_window_set_cursor (gtk_widget_get_window (widget),
|
||||
inside ? preview->cursor : NULL);
|
||||
|
||||
gtk_widget_queue_draw (widget);
|
||||
|
@ -715,7 +721,9 @@ print_preview_get_scale (PrintPreview *preview)
|
|||
gdouble paper_height;
|
||||
gdouble scale_x;
|
||||
gdouble scale_y;
|
||||
gint border = GTK_CONTAINER (widget)->border_width + 1;
|
||||
gint border;
|
||||
|
||||
border = gtk_container_get_border_width (GTK_CONTAINER (widget)) + 1;
|
||||
|
||||
print_preview_get_page_size (preview, &paper_width, &paper_height);
|
||||
|
||||
|
|
|
@ -747,10 +747,10 @@ pygimp_dialog_close(GtkWidget *widget)
|
|||
{
|
||||
/* Synthesize delete_event to close dialog. */
|
||||
|
||||
if (widget->window) {
|
||||
if (gtk_widget_get_window (widget)) {
|
||||
GdkEvent *event = gdk_event_new(GDK_DELETE);
|
||||
|
||||
event->any.window = g_object_ref(widget->window);
|
||||
event->any.window = g_object_ref (gtk_widget_get_window (widget));
|
||||
event->any.send_event = TRUE;
|
||||
|
||||
gtk_main_do_event(event);
|
||||
|
|
|
@ -484,7 +484,9 @@ script_fu_console_idle_scroll_end (GtkWidget *view)
|
|||
{
|
||||
GtkAdjustment *adj = GTK_TEXT_VIEW (view)->vadjustment;
|
||||
|
||||
gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
|
||||
gtk_adjustment_set_value (adj,
|
||||
gtk_adjustment_get_upper (adj) -
|
||||
gtk_adjustment_get_page_size (adj));
|
||||
|
||||
g_object_unref (view);
|
||||
|
||||
|
|
208
po-libgimp/sv.po
208
po-libgimp/sv.po
|
@ -9,7 +9,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: libgimp\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2009-07-26 16:29+0200\n"
|
||||
"POT-Creation-Date: 2009-10-09 22:30+0200\n"
|
||||
"PO-Revision-Date: 2009-07-26 16:29+0100\n"
|
||||
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
|
||||
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
||||
|
@ -47,37 +47,34 @@ msgstr "Penselval"
|
|||
msgid "_Browse..."
|
||||
msgstr "_Bläddra..."
|
||||
|
||||
#: ../libgimp/gimpexport.c:223
|
||||
#: ../libgimp/gimpexport.c:259
|
||||
#: ../libgimp/gimpexport.c:223 ../libgimp/gimpexport.c:259
|
||||
#, c-format
|
||||
msgid "%s plug-in can't handle layers"
|
||||
msgstr "Insticksmodulen %s kan inte hantera lager"
|
||||
|
||||
#: ../libgimp/gimpexport.c:224
|
||||
#: ../libgimp/gimpexport.c:233
|
||||
#: ../libgimp/gimpexport.c:242
|
||||
#: ../libgimp/gimpexport.c:260
|
||||
#: ../libgimp/gimpexport.c:224 ../libgimp/gimpexport.c:233
|
||||
#: ../libgimp/gimpexport.c:242 ../libgimp/gimpexport.c:260
|
||||
msgid "Merge Visible Layers"
|
||||
msgstr "Slå samman synliga lager"
|
||||
|
||||
#: ../libgimp/gimpexport.c:232
|
||||
#, c-format
|
||||
msgid "%s plug-in can't handle layer offsets, size or opacity"
|
||||
msgstr "Insticksmodulen %s kan inte hantera lageravstånd, lagerstorlek eller lageropacitet"
|
||||
msgstr ""
|
||||
"Insticksmodulen %s kan inte hantera lageravstånd, lagerstorlek eller "
|
||||
"lageropacitet"
|
||||
|
||||
#: ../libgimp/gimpexport.c:241
|
||||
#: ../libgimp/gimpexport.c:250
|
||||
#: ../libgimp/gimpexport.c:241 ../libgimp/gimpexport.c:250
|
||||
#, c-format
|
||||
msgid "%s plug-in can only handle layers as animation frames"
|
||||
msgstr "Insticksmodulen %s kan endast hantera lager som bildrutor i en animation"
|
||||
msgstr ""
|
||||
"Insticksmodulen %s kan endast hantera lager som bildrutor i en animation"
|
||||
|
||||
#: ../libgimp/gimpexport.c:242
|
||||
#: ../libgimp/gimpexport.c:251
|
||||
#: ../libgimp/gimpexport.c:242 ../libgimp/gimpexport.c:251
|
||||
msgid "Save as Animation"
|
||||
msgstr "Spara som animation"
|
||||
|
||||
#: ../libgimp/gimpexport.c:251
|
||||
#: ../libgimp/gimpexport.c:260
|
||||
#: ../libgimp/gimpexport.c:251 ../libgimp/gimpexport.c:260
|
||||
#: ../libgimp/gimpexport.c:269
|
||||
msgid "Flatten Image"
|
||||
msgstr "Platta till bild"
|
||||
|
@ -101,8 +98,7 @@ msgstr "Applicera lagermask"
|
|||
msgid "%s plug-in can only handle RGB images"
|
||||
msgstr "Insticksmodulen %s kan endast hantera RGB-bilder"
|
||||
|
||||
#: ../libgimp/gimpexport.c:287
|
||||
#: ../libgimp/gimpexport.c:325
|
||||
#: ../libgimp/gimpexport.c:287 ../libgimp/gimpexport.c:325
|
||||
#: ../libgimp/gimpexport.c:334
|
||||
msgid "Convert to RGB"
|
||||
msgstr "Konvertera till RGB"
|
||||
|
@ -112,8 +108,7 @@ msgstr "Konvertera till RGB"
|
|||
msgid "%s plug-in can only handle grayscale images"
|
||||
msgstr "Insticksmodulen %s kan endast hantera gråskalebilder"
|
||||
|
||||
#: ../libgimp/gimpexport.c:296
|
||||
#: ../libgimp/gimpexport.c:325
|
||||
#: ../libgimp/gimpexport.c:296 ../libgimp/gimpexport.c:325
|
||||
#: ../libgimp/gimpexport.c:346
|
||||
msgid "Convert to Grayscale"
|
||||
msgstr "Konvertera till gråskala"
|
||||
|
@ -123,8 +118,7 @@ msgstr "Konvertera till gråskala"
|
|||
msgid "%s plug-in can only handle indexed images"
|
||||
msgstr "Insticksmodulen %s kan endast hantera indexerade bilder"
|
||||
|
||||
#: ../libgimp/gimpexport.c:305
|
||||
#: ../libgimp/gimpexport.c:334
|
||||
#: ../libgimp/gimpexport.c:305 ../libgimp/gimpexport.c:334
|
||||
#: ../libgimp/gimpexport.c:344
|
||||
msgid ""
|
||||
"Convert to Indexed using default settings\n"
|
||||
|
@ -136,7 +130,8 @@ msgstr ""
|
|||
#: ../libgimp/gimpexport.c:314
|
||||
#, c-format
|
||||
msgid "%s plug-in can only handle bitmap (two color) indexed images"
|
||||
msgstr "Insticksmodulen %s kan endast hantera bitmapp (tvåfärgs) indexerade bilder"
|
||||
msgstr ""
|
||||
"Insticksmodulen %s kan endast hantera bitmapp (tvåfärgs) indexerade bilder"
|
||||
|
||||
#: ../libgimp/gimpexport.c:315
|
||||
msgid ""
|
||||
|
@ -154,12 +149,14 @@ msgstr "Insticksmodulen %s kan endast hantera RGB-bilder eller gråskalebilder"
|
|||
#: ../libgimp/gimpexport.c:333
|
||||
#, c-format
|
||||
msgid "%s plug-in can only handle RGB or indexed images"
|
||||
msgstr "Insticksmodulen %s kan endast hantera RGB-bilder eller indexerade bilder"
|
||||
msgstr ""
|
||||
"Insticksmodulen %s kan endast hantera RGB-bilder eller indexerade bilder"
|
||||
|
||||
#: ../libgimp/gimpexport.c:343
|
||||
#, c-format
|
||||
msgid "%s plug-in can only handle grayscale or indexed images"
|
||||
msgstr "Insticksmodulen %s kan endast hantera gråskalebilder eller indexerade bilder"
|
||||
msgstr ""
|
||||
"Insticksmodulen %s kan endast hantera gråskalebilder eller indexerade bilder"
|
||||
|
||||
#: ../libgimp/gimpexport.c:354
|
||||
#, c-format
|
||||
|
@ -186,16 +183,18 @@ msgstr "Exportera fil"
|
|||
msgid "_Ignore"
|
||||
msgstr "_Ignorera"
|
||||
|
||||
#: ../libgimp/gimpexport.c:498
|
||||
#: ../libgimp/gimpexport.c:969
|
||||
#: ../libgimp/gimpexport.c:498 ../libgimp/gimpexport.c:969
|
||||
msgid "_Export"
|
||||
msgstr "_Export"
|
||||
|
||||
#. the headline
|
||||
#: ../libgimp/gimpexport.c:528
|
||||
#, c-format
|
||||
msgid "Your image should be exported before it can be saved as %s for the following reasons:"
|
||||
msgstr "Din bild bör exporteras innan den kan sparas som %s av följande anledningar:"
|
||||
msgid ""
|
||||
"Your image should be exported before it can be saved as %s for the following "
|
||||
"reasons:"
|
||||
msgstr ""
|
||||
"Din bild bör exporteras innan den kan sparas som %s av följande anledningar:"
|
||||
|
||||
#. the footline
|
||||
#: ../libgimp/gimpexport.c:602
|
||||
|
@ -236,8 +235,7 @@ msgstr "Sans"
|
|||
msgid "Gradient Selection"
|
||||
msgstr "Gradientval"
|
||||
|
||||
#: ../libgimp/gimpmenu.c:449
|
||||
#: ../libgimpwidgets/gimpintstore.c:238
|
||||
#: ../libgimp/gimpmenu.c:449 ../libgimpwidgets/gimpintstore.c:238
|
||||
msgid "(Empty)"
|
||||
msgstr "(Tom)"
|
||||
|
||||
|
@ -279,8 +277,7 @@ msgstr "efter typ"
|
|||
|
||||
#. count label
|
||||
#: ../libgimp/gimpprocbrowserdialog.c:385
|
||||
#: ../libgimp/gimpprocbrowserdialog.c:536
|
||||
#: ../libgimpwidgets/gimpbrowser.c:130
|
||||
#: ../libgimp/gimpprocbrowserdialog.c:536 ../libgimpwidgets/gimpbrowser.c:130
|
||||
msgid "No matches"
|
||||
msgstr "Inga sökträffar"
|
||||
|
||||
|
@ -891,10 +888,9 @@ msgctxt "text-justification"
|
|||
msgid "Filled"
|
||||
msgstr "Fylld"
|
||||
|
||||
#: ../libgimpbase/gimputils.c:169
|
||||
#: ../libgimpbase/gimputils.c:174
|
||||
#: ../modules/color-selector-cmyk-lcms.c:406
|
||||
#: ../modules/color-selector-cmyk-lcms.c:412
|
||||
#: ../libgimpbase/gimputils.c:169 ../libgimpbase/gimputils.c:174
|
||||
#: ../modules/color-selector-cmyk-lcms.c:409
|
||||
#: ../modules/color-selector-cmyk-lcms.c:415
|
||||
#: ../modules/display-filter-lcms.c:182
|
||||
msgid "(invalid UTF-8 string)"
|
||||
msgstr "(ogiltig UTF-8 sträng)"
|
||||
|
@ -908,8 +904,14 @@ msgid "The color profile of your (primary) monitor."
|
|||
msgstr "Färgprofilen för din (primära) skärm."
|
||||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:45
|
||||
msgid "When enabled, GIMP will try to use the display color profile from the windowing system. The configured monitor profile is then only used as a fallback."
|
||||
msgstr "När aktiverad kommer GIMP att försöka använda displayfärgprofilen från fönstersystemet. Den konfigurerade skärmprofilen kommer då endast att användas för att falla tillbaka på."
|
||||
msgid ""
|
||||
"When enabled, GIMP will try to use the display color profile from the "
|
||||
"windowing system. The configured monitor profile is then only used as a "
|
||||
"fallback."
|
||||
msgstr ""
|
||||
"När aktiverad kommer GIMP att försöka använda displayfärgprofilen från "
|
||||
"fönstersystemet. Den konfigurerade skärmprofilen kommer då endast att "
|
||||
"användas för att falla tillbaka på."
|
||||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:49
|
||||
msgid "The default RGB working space color profile."
|
||||
|
@ -921,19 +923,29 @@ msgstr "CMYK-färgprofilen som används för att konvertera mellan RGB och CMYK.
|
|||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:53
|
||||
msgid "The color profile used for simulating a printed version (softproof)."
|
||||
msgstr "Färgprofilen som används för simulering av en utskriven version (färggodkännande på skärm)."
|
||||
msgstr ""
|
||||
"Färgprofilen som används för simulering av en utskriven version "
|
||||
"(färggodkännande på skärm)."
|
||||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:55
|
||||
msgid "Sets how colors are mapped for your display."
|
||||
msgstr "Ställer in hur färger mappas för din display."
|
||||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:57
|
||||
msgid "Sets how colors are converted from RGB working space to the print simulation device."
|
||||
msgstr "Ställer in hur färger konverteras från RGB-arbetsrymd till enheten för utskriftssimulering."
|
||||
msgid ""
|
||||
"Sets how colors are converted from RGB working space to the print simulation "
|
||||
"device."
|
||||
msgstr ""
|
||||
"Ställer in hur färger konverteras från RGB-arbetsrymd till enheten för "
|
||||
"utskriftssimulering."
|
||||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:60
|
||||
msgid "When enabled, the print simulation will mark colors which can not be represented in the target color space."
|
||||
msgstr "När aktiverad kommer utskriftssimuleringen att markera färger som inte kan representeras i målfärgrymden."
|
||||
msgid ""
|
||||
"When enabled, the print simulation will mark colors which can not be "
|
||||
"represented in the target color space."
|
||||
msgstr ""
|
||||
"När aktiverad kommer utskriftssimuleringen att markera färger som inte kan "
|
||||
"representeras i målfärgrymden."
|
||||
|
||||
#: ../libgimpconfig/gimpcolorconfig.c:63
|
||||
msgid "The color to use for marking colors which are out of gamut."
|
||||
|
@ -1001,8 +1013,7 @@ msgid "while parsing token '%s': %s"
|
|||
msgstr "vid tolkning av elementet \"%s\": %s"
|
||||
|
||||
#: ../libgimpconfig/gimpconfig-iface.c:473
|
||||
#: ../libgimpconfig/gimpconfig-iface.c:486
|
||||
#: ../libgimpconfig/gimpscanner.c:501
|
||||
#: ../libgimpconfig/gimpconfig-iface.c:486 ../libgimpconfig/gimpscanner.c:501
|
||||
#: ../libgimpconfig/gimpscanner.c:582
|
||||
#: ../libgimpwidgets/gimpcolorprofilestore.c:655
|
||||
msgid "fatal parse error"
|
||||
|
@ -1063,10 +1074,8 @@ msgstr "ogiltig UTF-8-sträng"
|
|||
msgid "Error while parsing '%s' in line %d: %s"
|
||||
msgstr "Fel vid tolkning av \"%s\" på rad %d: %s"
|
||||
|
||||
#: ../libgimpmodule/gimpmodule.c:152
|
||||
#: ../libgimpmodule/gimpmodule.c:170
|
||||
#: ../libgimpmodule/gimpmodule.c:279
|
||||
#: ../libgimpmodule/gimpmodule.c:306
|
||||
#: ../libgimpmodule/gimpmodule.c:152 ../libgimpmodule/gimpmodule.c:170
|
||||
#: ../libgimpmodule/gimpmodule.c:279 ../libgimpmodule/gimpmodule.c:306
|
||||
#: ../libgimpmodule/gimpmodule.c:432
|
||||
#, c-format
|
||||
msgid "Module '%s' load error: %s"
|
||||
|
@ -1097,8 +1106,7 @@ msgstr ""
|
|||
"Kan inte fastställa en giltig hemkatalog.\n"
|
||||
"Miniatyrbilder kommer istället att lagras i mappen för temporärfiler (%s)."
|
||||
|
||||
#: ../libgimpthumb/gimpthumb-utils.c:246
|
||||
#: ../libgimpthumb/gimpthumb-utils.c:314
|
||||
#: ../libgimpthumb/gimpthumb-utils.c:246 ../libgimpthumb/gimpthumb-utils.c:314
|
||||
#, c-format
|
||||
msgid "Failed to create thumbnail folder '%s'."
|
||||
msgstr "Kunde inte skapa miniatyrbildskatalog \"%s\"."
|
||||
|
@ -1155,8 +1163,12 @@ msgid "Old:"
|
|||
msgstr "Gammal:"
|
||||
|
||||
#: ../libgimpwidgets/gimpcolorselection.c:285
|
||||
msgid "Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS color names."
|
||||
msgstr "Hexadecimal färgnotation som används i HTML och CSS. Den här posten accepterar även CSS-färgnamn."
|
||||
msgid ""
|
||||
"Hexadecimal color notation as used in HTML and CSS. This entry also accepts "
|
||||
"CSS color names."
|
||||
msgstr ""
|
||||
"Hexadecimal färgnotation som används i HTML och CSS. Den här posten "
|
||||
"accepterar även CSS-färgnamn."
|
||||
|
||||
#: ../libgimpwidgets/gimpcolorselection.c:291
|
||||
msgid "HTML _notation:"
|
||||
|
@ -1243,8 +1255,12 @@ msgid "Folder"
|
|||
msgstr "Mapp"
|
||||
|
||||
#: ../libgimpwidgets/gimppickbutton.c:106
|
||||
msgid "Click the eyedropper, then click a color anywhere on your screen to select that color."
|
||||
msgstr "Klicka på pipetten och klicka sedan på en färg någonstans på din skärm för att välja den färgen."
|
||||
msgid ""
|
||||
"Click the eyedropper, then click a color anywhere on your screen to select "
|
||||
"that color."
|
||||
msgstr ""
|
||||
"Klicka på pipetten och klicka sedan på en färg någonstans på din skärm för "
|
||||
"att välja den färgen."
|
||||
|
||||
#. toggle button to (de)activate the instant preview
|
||||
#: ../libgimpwidgets/gimppreview.c:276
|
||||
|
@ -1302,8 +1318,7 @@ msgstr "_Återställ"
|
|||
msgid "Visible"
|
||||
msgstr "Synlig"
|
||||
|
||||
#: ../libgimpwidgets/gimpstock.c:155
|
||||
#: ../libgimpwidgets/gimpstock.c:159
|
||||
#: ../libgimpwidgets/gimpstock.c:155 ../libgimpwidgets/gimpstock.c:159
|
||||
msgid "_Stroke"
|
||||
msgstr "_Stryk"
|
||||
|
||||
|
@ -1319,8 +1334,7 @@ msgstr "_Radmellanrum"
|
|||
msgid "_Resize"
|
||||
msgstr "_Ändra storlek"
|
||||
|
||||
#: ../libgimpwidgets/gimpstock.c:189
|
||||
#: ../libgimpwidgets/gimpstock.c:319
|
||||
#: ../libgimpwidgets/gimpstock.c:189 ../libgimpwidgets/gimpstock.c:319
|
||||
msgid "_Scale"
|
||||
msgstr "_Skala"
|
||||
|
||||
|
@ -1357,8 +1371,12 @@ msgid "Factor"
|
|||
msgstr "Faktor"
|
||||
|
||||
#: ../libgimpwidgets/gimpwidgets.c:510
|
||||
msgid "Use this value for random number generator seed - this allows you to repeat a given \"random\" operation"
|
||||
msgstr "Använd detta värde för generering av slumptalsfrö - det låter dig upprepa en given \"slumpfunktion\""
|
||||
msgid ""
|
||||
"Use this value for random number generator seed - this allows you to repeat "
|
||||
"a given \"random\" operation"
|
||||
msgstr ""
|
||||
"Använd detta värde för generering av slumptalsfrö - det låter dig upprepa en "
|
||||
"given \"slumpfunktion\""
|
||||
|
||||
#: ../libgimpwidgets/gimpwidgets.c:514
|
||||
msgid "_New Seed"
|
||||
|
@ -1412,7 +1430,7 @@ msgstr "_I"
|
|||
|
||||
#: ../libgimpwidgets/gimpwidgetsenums.c:128
|
||||
msgid "Value"
|
||||
msgstr "Värde"
|
||||
msgstr "Intensitet"
|
||||
|
||||
#: ../libgimpwidgets/gimpwidgetsenums.c:129
|
||||
msgctxt "color-selector-channel"
|
||||
|
@ -1523,11 +1541,11 @@ msgstr "Gul"
|
|||
msgid "Black"
|
||||
msgstr "Svart"
|
||||
|
||||
#: ../modules/color-selector-cmyk-lcms.c:394
|
||||
#: ../modules/color-selector-cmyk-lcms.c:397
|
||||
msgid "Profile: (none)"
|
||||
msgstr "Profil: (ingen)"
|
||||
|
||||
#: ../modules/color-selector-cmyk-lcms.c:415
|
||||
#: ../modules/color-selector-cmyk-lcms.c:418
|
||||
#, c-format
|
||||
msgid "Profile: %s"
|
||||
msgstr "Profil: %s"
|
||||
|
@ -1569,8 +1587,7 @@ msgid "DirectX DirectInput event controller"
|
|||
msgstr "Kontroller för DirectX DirectInput-händelser"
|
||||
|
||||
#: ../modules/controller-dx-dinput.c:195
|
||||
#: ../modules/controller-linux-input.c:217
|
||||
#: ../modules/controller-midi.c:211
|
||||
#: ../modules/controller-linux-input.c:217 ../modules/controller-midi.c:211
|
||||
msgid "Device:"
|
||||
msgstr "Enhet:"
|
||||
|
||||
|
@ -1683,8 +1700,7 @@ msgid "DirectInput Events"
|
|||
msgstr "DirectInput-händelser"
|
||||
|
||||
#: ../modules/controller-dx-dinput.c:1094
|
||||
#: ../modules/controller-linux-input.c:524
|
||||
#: ../modules/controller-midi.c:504
|
||||
#: ../modules/controller-linux-input.c:524 ../modules/controller-midi.c:504
|
||||
msgid "No device configured"
|
||||
msgstr "Ingen enhet konfigurerad"
|
||||
|
||||
|
@ -1837,24 +1853,20 @@ msgstr "Linux-inmatning"
|
|||
msgid "Linux Input Events"
|
||||
msgstr "Linux-inmatningshändelser"
|
||||
|
||||
#: ../modules/controller-linux-input.c:550
|
||||
#: ../modules/controller-midi.c:453
|
||||
#: ../modules/controller-linux-input.c:550 ../modules/controller-midi.c:453
|
||||
#: ../modules/controller-midi.c:479
|
||||
#, c-format
|
||||
msgid "Reading from %s"
|
||||
msgstr "Läser från %s"
|
||||
|
||||
#: ../modules/controller-linux-input.c:568
|
||||
#: ../modules/controller-linux-input.c:622
|
||||
#: ../modules/controller-midi.c:435
|
||||
#: ../modules/controller-midi.c:496
|
||||
#: ../modules/controller-midi.c:567
|
||||
#: ../modules/controller-linux-input.c:622 ../modules/controller-midi.c:435
|
||||
#: ../modules/controller-midi.c:496 ../modules/controller-midi.c:567
|
||||
#, c-format
|
||||
msgid "Device not available: %s"
|
||||
msgstr "Enheten är inte tillgänglig: %s"
|
||||
|
||||
#: ../modules/controller-linux-input.c:631
|
||||
#: ../modules/controller-midi.c:576
|
||||
#: ../modules/controller-linux-input.c:631 ../modules/controller-midi.c:576
|
||||
msgid "End of file"
|
||||
msgstr "Slut på filen"
|
||||
|
||||
|
@ -1875,8 +1887,12 @@ msgid "Channel:"
|
|||
msgstr "Kanal:"
|
||||
|
||||
#: ../modules/controller-midi.c:221
|
||||
msgid "The MIDI channel to read events from. Set to -1 for reading from all MIDI channels."
|
||||
msgstr "MIDI-kanalen att läsa av händelser från. Ställ in till -1 för läsning från alla MIDI-kanaler."
|
||||
msgid ""
|
||||
"The MIDI channel to read events from. Set to -1 for reading from all MIDI "
|
||||
"channels."
|
||||
msgstr ""
|
||||
"MIDI-kanalen att läsa av händelser från. Ställ in till -1 för läsning från "
|
||||
"alla MIDI-kanaler."
|
||||
|
||||
#: ../modules/controller-midi.c:225
|
||||
msgid "MIDI"
|
||||
|
@ -1923,7 +1939,8 @@ msgstr "Tritanopi (okänslighet för blått)"
|
|||
|
||||
#: ../modules/display-filter-color-blind.c:197
|
||||
msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
|
||||
msgstr "Simulationsfilter för färgbristfällighet (Brettel-Vienot-Mollon-algoritm)"
|
||||
msgstr ""
|
||||
"Simulationsfilter för färgbristfällighet (Brettel-Vienot-Mollon-algoritm)"
|
||||
|
||||
#: ../modules/display-filter-color-blind.c:260
|
||||
msgid "Color Deficient Vision"
|
||||
|
@ -1970,8 +1987,12 @@ msgid "None"
|
|||
msgstr "Ingen"
|
||||
|
||||
#: ../modules/display-filter-lcms.c:211
|
||||
msgid "This filter takes its configuration from the Color Management section in the Preferences dialog."
|
||||
msgstr "Det här filtret tar sin konfiguration från sektionen Färghantering i inställningsdialogrutan."
|
||||
msgid ""
|
||||
"This filter takes its configuration from the Color Management section in the "
|
||||
"Preferences dialog."
|
||||
msgstr ""
|
||||
"Det här filtret tar sin konfiguration från sektionen Färghantering i "
|
||||
"inställningsdialogrutan."
|
||||
|
||||
#: ../modules/display-filter-lcms.c:225
|
||||
msgid "Mode of operation:"
|
||||
|
@ -2023,58 +2044,81 @@ msgstr "_Svartpunktskompensering"
|
|||
|
||||
#~ msgid "gradient|Linear"
|
||||
#~ msgstr "Linjär"
|
||||
|
||||
#~ msgid "interpolation|None"
|
||||
#~ msgstr "Ingen"
|
||||
|
||||
#~ msgid "interpolation|Linear"
|
||||
#~ msgstr "Linjär"
|
||||
|
||||
#~ msgid "intent|Saturation"
|
||||
#~ msgstr "Mättnad"
|
||||
|
||||
#~ msgid "Painter-style triangle color selector"
|
||||
#~ msgstr "Triangelfärgväljare i Painter-stil"
|
||||
|
||||
#~ msgid "Triangle"
|
||||
#~ msgstr "Triangel"
|
||||
|
||||
#~ msgid "%d Byte"
|
||||
#~ msgid_plural "%d Bytes"
|
||||
#~ msgstr[0] "%d byte"
|
||||
#~ msgstr[1] "%d byte"
|
||||
|
||||
#~ msgid "%.2f KB"
|
||||
#~ msgstr "%.2f KB"
|
||||
|
||||
#~ msgid "%.1f KB"
|
||||
#~ msgstr "%.1f KB"
|
||||
|
||||
#~ msgid "%d KB"
|
||||
#~ msgstr "%d KB"
|
||||
|
||||
#~ msgid "%.2f MB"
|
||||
#~ msgstr "%.2f MB"
|
||||
|
||||
#~ msgid "%.1f MB"
|
||||
#~ msgstr "%.1f MB"
|
||||
|
||||
#~ msgid "%d MB"
|
||||
#~ msgstr "%d MB"
|
||||
|
||||
#~ msgid "%.2f GB"
|
||||
#~ msgstr "%.2f GB"
|
||||
|
||||
#~ msgid "%.1f GB"
|
||||
#~ msgstr "%.1f GB"
|
||||
|
||||
#~ msgid "%d GB"
|
||||
#~ msgstr "%d GB"
|
||||
|
||||
#~ msgid "profile|None"
|
||||
#~ msgstr "Ingen"
|
||||
|
||||
#~ msgid "RGB working space profile:"
|
||||
#~ msgstr "Profil för RGB-arbetsrymd:"
|
||||
|
||||
#~ msgid "Pattern source"
|
||||
#~ msgstr "Mönsterkälla"
|
||||
|
||||
#~ msgid "None (Fastest)"
|
||||
#~ msgstr "Ingen (snabbast)"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "Lanczos (Best)"
|
||||
#~ msgstr "Kubisk (bäst)"
|
||||
|
||||
#~ msgid "Forward (traditional)"
|
||||
#~ msgstr "Framåt (traditionell)"
|
||||
|
||||
#~ msgid "Backward (corrective)"
|
||||
#~ msgstr "Bakåt (korrektiv)"
|
||||
|
||||
#~ msgid "Could not open '%s' for reading: %s"
|
||||
#~ msgstr "Kunde inte öppna \"%s\" för läsning: %s"
|
||||
|
||||
#~ msgid "Loading module: '%s'\n"
|
||||
#~ msgstr "Läser in modul: \"%s\"\n"
|
||||
|
||||
#~ msgid "Skipping module: '%s'\n"
|
||||
#~ msgstr "Hoppar över modul: \"%s\"\n"
|
||||
|
||||
|
|
Loading…
Reference in New Issue