← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gimp/trusty

« back to all changes in this revision

Viewing changes to plug-ins/color-rotate/color-rotate-dialog.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-08 13:26:03 UTC
  • mfrom: (1.1.28) (0.4.19 sid)
  • Revision ID: package-import@ubuntu.com-20130308132603-h14fmrgazi3roobr
Tags: 2.8.4-1ubuntu1
https://launchpad.net/bugs/1132767
* Synchronize with Debian (LP: #1132767). Remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates
* Dropped changes:
  - CVE-2012-5576.patch: Applied in new version
  - fix-python-multiarch-includes.patch: No longer needed
* debian/patches/link-against-lm.patch:
  - Link against lm to fix underlinking build failure
* debian/control, debian/rules:
  - Run autoreconf for above patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/color-rotate/color-rotate-dialog.c
54
54
 
55
55
/* Defines */
56
56
 
57
 
#define INITIAL_ALPHA      0
58
 
#define INITIAL_BETA       G_PI_2
59
 
#define INITIAL_GRAY_SAT   0.0
60
 
#define INITIAL_GRAY_RSAT  0.0
61
 
#define INITIAL_GRAY_HUE   0.0
 
57
#define INITIAL_ALPHA              0.0
 
58
#define INITIAL_ALPHA_RADIANS      0.0
 
59
#define INITIAL_BETA               90.0
 
60
#define INITIAL_BETA_RADIANS       ((INITIAL_BETA / 360) * 2 * G_PI)
 
61
#define INITIAL_GRAY_SAT           0.0
 
62
#define INITIAL_GRAY_RSAT          0.0
 
63
#define INITIAL_GRAY_HUE           0.0
62
64
 
63
65
#define RANGE_ADJUST_MASK GDK_EXPOSURE_MASK | \
64
66
                          GDK_ENTER_NOTIFY_MASK | \
201
203
  st = g_new (RcmCircle, 1);
202
204
 
203
205
  st->angle         = g_new (RcmAngle, 1);
204
 
  st->angle->alpha  = INITIAL_ALPHA;
205
 
  st->angle->beta   = INITIAL_BETA;
 
206
  st->angle->alpha  = INITIAL_ALPHA_RADIANS;
 
207
  st->angle->beta   = INITIAL_BETA_RADIANS;
206
208
  st->angle->cw_ccw = 1;
207
209
 
208
210
  /** Main: Circle: create (main) frame **/
300
302
                    0, GTK_EXPAND, 5, 5);
301
303
 
302
304
  st->angle->alpha = INITIAL_ALPHA;
303
 
  adj = (GtkAdjustment *) gtk_adjustment_new(st->angle->alpha, 0.0, 2.0, 0.0001, 0.001, 0.0);
304
 
  st->alpha_entry = entry = gtk_spin_button_new(adj, 0.01, 4);
305
 
  gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(entry), TRUE);
 
305
  adj = (GtkAdjustment *) gtk_adjustment_new(st->angle->alpha,
 
306
                                             0.0, 360.0, 0.01, 1.0, 0.0);
 
307
  st->alpha_entry = entry = gtk_spin_button_new(adj, 0.01, 2);
 
308
  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON(entry), TRUE);
306
309
  gtk_table_attach(GTK_TABLE(legend_table), entry, 1,2, 0,1,
307
310
                   GTK_EXPAND|GTK_FILL, GTK_EXPAND, 2, 4);
308
311
  gtk_widget_show(entry);
325
328
  gtk_table_attach (GTK_TABLE (legend_table), label, 3,4, 0,1,
326
329
                    0, GTK_EXPAND, 4, 4);
327
330
 
328
 
  st->angle->beta = INITIAL_BETA;
329
 
  adj = (GtkAdjustment *) gtk_adjustment_new (st->angle->beta,
330
 
                                              0.0, 2.0, 0.0001, 0.001, 0.0);
331
 
  st->beta_entry = entry = gtk_spin_button_new (adj, 0.01, 4);
 
331
  st->angle->beta = INITIAL_BETA_RADIANS;
 
332
  adj = (GtkAdjustment *) gtk_adjustment_new (INITIAL_BETA, 0.0, 360.0, 0.01, 1.0, 0.0);
 
333
  st->beta_entry = entry = gtk_spin_button_new (adj, 0.01, 2);
332
334
  gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entry), TRUE);
333
335
  gtk_table_attach (GTK_TABLE (legend_table), entry, 4,5, 0,1,
334
336
                    GTK_EXPAND|GTK_FILL, GTK_EXPAND, 2, 4);