diff options
| author | xsacha <xsacha@d7aaf104-2d23-0410-ae22-9d23157bf5a3> | 2007-02-15 13:16:59 +0000 |
|---|---|---|
| committer | xsacha <xsacha@d7aaf104-2d23-0410-ae22-9d23157bf5a3> | 2007-02-15 13:16:59 +0000 |
| commit | 65b0e85420381900c98b6495e993543e4ebfc5b2 (patch) | |
| tree | 8fb67eb007e5669a645be6797f24e82915678a9b | |
| parent | 91266f831c18b365106e731f13411aba48bf077e (diff) | |
| download | marex-dev-65b0e85420381900c98b6495e993543e4ebfc5b2.tar.gz marex-dev-65b0e85420381900c98b6495e993543e4ebfc5b2.tar.bz2 | |
beryl-plugins: Fixed up magic lamp 3 settings. Fixed button number option for Initiate Display Rotation
git-svn-id: file:///beryl/trunk@4074 d7aaf104-2d23-0410-ae22-9d23157bf5a3
| -rw-r--r-- | beryl-plugins/src/animation.c | 10 | ||||
| -rw-r--r-- | beryl-plugins/src/rotate.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/beryl-plugins/src/animation.c b/beryl-plugins/src/animation.c index eecceb1..2041df3 100644 --- a/beryl-plugins/src/animation.c +++ b/beryl-plugins/src/animation.c @@ -6539,7 +6539,7 @@ static void animScreenInitOptions(AnimScreen * as) o = &as->opt[ANIM_SCREEN_OPTION_MAGIC_LAMP3_GRID_RES]; - o->name = "magic_lamp2_grid_res"; + o->name = "magic_lamp3_grid_res"; o->group = N_("Magic Lamp"); o->subGroup = N_("Magic Lamp #3"); o->advanced = False; @@ -6554,7 +6554,7 @@ static void animScreenInitOptions(AnimScreen * as) o->rest.i.max = ANIM_MAGIC_LAMP3_GRID_RES_MAX; o = &as->opt[ANIM_SCREEN_OPTION_MAGIC_LAMP3_MAX_WAVES]; - o->name = "magic_lamp2_max_waves"; + o->name = "magic_lamp3_max_waves"; o->group = N_("Magic Lamp"); o->subGroup = N_("Magic Lamp #3"); o->advanced = False; @@ -6567,7 +6567,7 @@ static void animScreenInitOptions(AnimScreen * as) o->rest.i.max = ANIM_MAGIC_LAMP3_MAX_WAVES_MAX; o = &as->opt[ANIM_SCREEN_OPTION_MAGIC_LAMP3_WAVE_AMP_MIN]; - o->name = "magic_lamp2_wave_amp_min"; + o->name = "magic_lamp3_wave_amp_min"; o->group = N_("Magic Lamp"); o->subGroup = N_("Magic Lamp #3"); o->advanced = False; @@ -6583,7 +6583,7 @@ static void animScreenInitOptions(AnimScreen * as) o->rest.f.precision = ANIM_MAGIC_LAMP3_WAVE_AMP_MIN_PRECISION; o = &as->opt[ANIM_SCREEN_OPTION_MAGIC_LAMP3_WAVE_AMP_MAX]; - o->name = "magic_lamp2_wave_amp_max"; + o->name = "magic_lamp3_wave_amp_max"; o->group = N_("Magic Lamp"); o->subGroup = N_("Magic Lamp #3"); o->advanced = False; @@ -6599,7 +6599,7 @@ static void animScreenInitOptions(AnimScreen * as) o->rest.f.precision = ANIM_MAGIC_LAMP3_WAVE_AMP_MAX_PRECISION; o = &as->opt[ANIM_SCREEN_OPTION_MAGIC_LAMP3_CREATE_START_WIDTH]; - o->name = "magic_lamp2_create_start_width"; + o->name = "magic_lamp3_create_start_width"; o->group = N_("Magic Lamp"); o->subGroup = N_("Magic Lamp #3"); o->advanced = False; diff --git a/beryl-plugins/src/rotate.c b/beryl-plugins/src/rotate.c index 0b78909..e31a840 100644 --- a/beryl-plugins/src/rotate.c +++ b/beryl-plugins/src/rotate.c @@ -2393,7 +2393,7 @@ static void rotateDisplayInitOptions(RotateDisplay * rd) o->value.action.edgeMask = 0; o->value.action.state = CompActionStateInitKey; o->value.action.state |= CompActionStateInitButton; - o->value.action.type = CompBindingTypeButton; + o->value.action.type = CompBindingTypeNone; //o->value.action.button.modifiers = ROTATE_INITIATE_ALL_MODIFIERS_DEFAULT; //o->value.action.button.button = ROTATE_INITIATE_ALL_BUTTON_DEFAULT; |