WebSVN - DIN Is Noise - Diff - Rev 2338 and 2340



    &ol_mirror_tangents,
    &cb_selection_only,
    &b_undo,
    &b_redo,
    &b_copy,
    &ol_paste,
    &b_draw_replacement_curve,
    &l_library,
    &abl_left,
    &abl_right,
    &lf_curve_name,

    &b_draw_replacement_curve,
    &b_undo,
    &b_redo,
    &viewtoo,
    &b_copy,
    &ol_paste,
    &b_swap_curves,
    &size_tangent,
    &b_fold_tangents,
    &cb_selection_only,
    &ol_mirror,

    &b_delete_vertex,
    &b_draw_replacement_curve,
    &b_fold_tangents,
    &ol_mirror.option,
    &b_copy,
    &ol_paste.option,
    &b_swap_curves,
    &b_undo,
    &b_redo,
    &abl_left,
    &abl_right,

  for (int i = 0; i < 23; ++i) crvops[i]->set_listener (&col);
  col.name = "Tangent size"; // via mouse slider

#endif

  options_list* oll [] = {
    &ol_ball_types, &ol_split_types_h, &ol_split_types_v, &ol_selection_targets,
    &ol_auto_pick_box_split, &ol_auto_split_at, &ol_auto_split_orient,
    &ol_auto_pick_box_delete
  };
  for (int i = 0; i < 8; ++i) {
    options_list* oli = oll[i];
    oli->set_listener (&monl);
  }
  ol_split_types_h.set_text (mondrian_listener::split_types[monl.hsplit]);


  b_undo.click_repeat = b_redo.click_repeat = 1;
  abl_left.click_repeat = abl_right.click_repeat = 1;

  ol_mirror.set_listener (this);

  lf_curve_name.set_listener (&col);
  ol_paste.set_listener (&pastl);

#ifndef __WIDGET_MOVE__
  checkbutton* cbed [] = {&cb_label_vertices, &cb_mark_segments, &cb_overlay, &cb_draw_curve, &draweditables, &cb_ed_autoflip, &sp_curve_every.variance.cb, 0};
  checkbutton** cp = cbed;
  while (*cp != 0) {
    (*cp)->set_listener (&col);

    "Delete vertex",
    "Fold tangents",
    "Undo",
    "Redo",
    "Copy",
    " Paste",
    "Draw & replace curve",
    "Add",
    "Replace",
    "Delete",
    "Start",

    &b_delete_vertex,
    &b_fold_tangents,
    &b_undo,
    &b_redo,
    &b_copy,
    &ol_paste.option,
    &b_draw_replacement_curve,
    &b_add_curve,
    &b_replace_curve,
    &b_delete_curve,
    &b_start_capture,

    CRVED->fold_tangents_using_menu ();
  } else if (&b == MENUP.ol_mirror.option) {
    CRVED->mirror_using_menu ();
  } else if (&b == MENUP.b_copy) {
    CRVED->copy_using_menu ();
  } else if (&b == MENUP.ol_paste.option) {
    CRVED->paste_using_menu ();
  } else if (&b == MENUP.b_swap_curves) {
    CRVED->swap ();
  } else if (&b == MENUP.b_pick_curve) {
    CRVED->do_pick_curve ();

  colorer += dir;
  l.set_text (colorer_t::s_schemes[colorer.i]);
  din0.color_selected_drones ();
}

PICKED_OPTION(menu,ol_paste_lis) {
  static const char* types [] = {" Paste", " Paste Append"};
  int& id = MENU.ol_paste.id;
  id = !id;
  MENU.ol_paste.set_text (types[id]);
}

void menu::initdroneparamtabs (checkbutton& cb) {
  MENU.cb_modulation.set_state (0,0);
  MENU.cb_visual.set_state (0,0);
  MENU.cb_motion.set_state (0,0);

Rev 2338	Rev 2340
Line 203...	Line 203...
203	&ol_mirror_tangents,	203	&ol_mirror_tangents,
204	&cb_selection_only,	204	&cb_selection_only,
205	&b_undo,	205	&b_undo,
206	&b_redo,	206	&b_redo,
207	&b_copy,	207	&b_copy,
208	&b_paste,	208	&ol_paste,
209	&b_draw_replacement_curve,	209	&b_draw_replacement_curve,
210	&l_library,	210	&l_library,
211	&abl_left,	211	&abl_left,
212	&abl_right,	212	&abl_right,
213	&lf_curve_name,	213	&lf_curve_name,
Line 1076...	Line 1076...
1076	&b_draw_replacement_curve,	1076	&b_draw_replacement_curve,
1077	&b_undo,	1077	&b_undo,
1078	&b_redo,	1078	&b_redo,
1079	&viewtoo,	1079	&viewtoo,
1080	&b_copy,	1080	&b_copy,
1081	&b_paste,	1081	&ol_paste,
1082	&b_swap_curves,	1082	&b_swap_curves,
1083	&size_tangent,	1083	&size_tangent,
1084	&b_fold_tangents,	1084	&b_fold_tangents,
1085	&cb_selection_only,	1085	&cb_selection_only,
1086	&ol_mirror,	1086	&ol_mirror,
Line 1266...	Line 1266...
1266	&b_delete_vertex,	1266	&b_delete_vertex,
1267	&b_draw_replacement_curve,	1267	&b_draw_replacement_curve,
1268	&b_fold_tangents,	1268	&b_fold_tangents,
1269	&ol_mirror.option,	1269	&ol_mirror.option,
1270	&b_copy,	1270	&b_copy,
1271	&b_paste,	1271	&ol_paste.option,
1272	&b_swap_curves,	1272	&b_swap_curves,
1273	&b_undo,	1273	&b_undo,
1274	&b_redo,	1274	&b_redo,
1275	&abl_left,	1275	&abl_left,
1276	&abl_right,	1276	&abl_right,
Line 1289...	Line 1289...
1289	for (int i = 0; i < 23; ++i) crvops[i]->set_listener (&col);	1289	for (int i = 0; i < 23; ++i) crvops[i]->set_listener (&col);
1290	col.name = "Tangent size"; // via mouse slider	1290	col.name = "Tangent size"; // via mouse slider
1291		1291
1292	#endif	1292	#endif
1293		1293
-		1294	options_list* oll [] = {
1294	options_list* oll [] = {&ol_ball_types, &ol_split_types_h, &ol_split_types_v, &ol_selection_targets,	1295	&ol_ball_types, &ol_split_types_h, &ol_split_types_v, &ol_selection_targets,
1295	&ol_auto_pick_box_split, &ol_auto_split_at, &ol_auto_split_orient, &ol_auto_pick_box_delete};	1296	&ol_auto_pick_box_split, &ol_auto_split_at, &ol_auto_split_orient,
-		1297	&ol_auto_pick_box_delete
-		1298	};
1296	for (int i = 0; i < 8; ++i) {	1299	for (int i = 0; i < 8; ++i) {
1297	options_list* oli = oll[i];	1300	options_list* oli = oll[i];
1298	oli->set_listener (&monl);	1301	oli->set_listener (&monl);
1299	}	1302	}
1300	ol_split_types_h.set_text (mondrian_listener::split_types[monl.hsplit]);	1303	ol_split_types_h.set_text (mondrian_listener::split_types[monl.hsplit]);
Line 1304...	Line 1307...
1304		1307
1305	b_undo.click_repeat = b_redo.click_repeat = 1;	1308	b_undo.click_repeat = b_redo.click_repeat = 1;
1306	abl_left.click_repeat = abl_right.click_repeat = 1;	1309	abl_left.click_repeat = abl_right.click_repeat = 1;
1307		1310
1308	ol_mirror.set_listener (this);	1311	ol_mirror.set_listener (this);
-		1312
1309	lf_curve_name.set_listener (&col);	1313	lf_curve_name.set_listener (&col);
-		1314	ol_paste.set_listener (&pastl);
-		1315
1310	#ifndef __WIDGET_MOVE__	1316	#ifndef __WIDGET_MOVE__
1311	checkbutton* cbed [] = {&cb_label_vertices, &cb_mark_segments, &cb_overlay, &cb_draw_curve, &draweditables, &cb_ed_autoflip, &sp_curve_every.variance.cb, 0};	1317	checkbutton* cbed [] = {&cb_label_vertices, &cb_mark_segments, &cb_overlay, &cb_draw_curve, &draweditables, &cb_ed_autoflip, &sp_curve_every.variance.cb, 0};
1312	checkbutton** cp = cbed;	1318	checkbutton** cp = cbed;
1313	while (*cp != 0) {	1319	while (*cp != 0) {
1314	(*cp)->set_listener (&col);	1320	(*cp)->set_listener (&col);
Line 1980...	Line 1986...
1980	"Delete vertex",	1986	"Delete vertex",
1981	"Fold tangents",	1987	"Fold tangents",
1982	"Undo",	1988	"Undo",
1983	"Redo",	1989	"Redo",
1984	"Copy",	1990	"Copy",
1985	"Paste",	1991	" Paste",
1986	"Draw & replace curve",	1992	"Draw & replace curve",
1987	"Add",	1993	"Add",
1988	"Replace",	1994	"Replace",
1989	"Delete",	1995	"Delete",
1990	"Start",	1996	"Start",
Line 2219...	Line 2225...
2219	&b_delete_vertex,	2225	&b_delete_vertex,
2220	&b_fold_tangents,	2226	&b_fold_tangents,
2221	&b_undo,	2227	&b_undo,
2222	&b_redo,	2228	&b_redo,
2223	&b_copy,	2229	&b_copy,
2224	&b_paste,	2230	&ol_paste.option,
2225	&b_draw_replacement_curve,	2231	&b_draw_replacement_curve,
2226	&b_add_curve,	2232	&b_add_curve,
2227	&b_replace_curve,	2233	&b_replace_curve,
2228	&b_delete_curve,	2234	&b_delete_curve,
2229	&b_start_capture,	2235	&b_start_capture,
Line 3795...	Line 3801...
3795	CRVED->fold_tangents_using_menu ();	3801	CRVED->fold_tangents_using_menu ();
3796	} else if (&b == MENUP.ol_mirror.option) {	3802	} else if (&b == MENUP.ol_mirror.option) {
3797	CRVED->mirror_using_menu ();	3803	CRVED->mirror_using_menu ();
3798	} else if (&b == MENUP.b_copy) {	3804	} else if (&b == MENUP.b_copy) {
3799	CRVED->copy_using_menu ();	3805	CRVED->copy_using_menu ();
3800	} else if (&b == MENUP.b_paste) {	3806	} else if (&b == MENUP.ol_paste.option) {
3801	CRVED->paste_using_menu ();	3807	CRVED->paste_using_menu ();
3802	} else if (&b == MENUP.b_swap_curves) {	3808	} else if (&b == MENUP.b_swap_curves) {
3803	CRVED->swap ();	3809	CRVED->swap ();
3804	} else if (&b == MENUP.b_pick_curve) {	3810	} else if (&b == MENUP.b_pick_curve) {
3805	CRVED->do_pick_curve ();	3811	CRVED->do_pick_curve ();
Line 4747...	Line 4753...
4747	colorer += dir;	4753	colorer += dir;
4748	l.set_text (colorer_t::s_schemes[colorer.i]);	4754	l.set_text (colorer_t::s_schemes[colorer.i]);
4749	din0.color_selected_drones ();	4755	din0.color_selected_drones ();
4750	}	4756	}
4751		4757
-		4758	PICKED_OPTION(menu,ol_paste_lis) {
-		4759	static const char* types [] = {" Paste", " Paste Append"};
-		4760	int& id = MENU.ol_paste.id;
-		4761	id = !id;
-		4762	MENU.ol_paste.set_text (types[id]);
-		4763	}
4752		4764
4753	void menu::initdroneparamtabs (checkbutton& cb) {	4765	void menu::initdroneparamtabs (checkbutton& cb) {
4754	MENU.cb_modulation.set_state (0,0);	4766	MENU.cb_modulation.set_state (0,0);
4755	MENU.cb_visual.set_state (0,0);	4767	MENU.cb_visual.set_state (0,0);
4756	MENU.cb_motion.set_state (0,0);	4768	MENU.cb_motion.set_state (0,0);

Subversion Repositories DIN Is Noise

(root)/wip/src/menu.cc - Rev 2338 → 2340