Attachment #84904 for bug #66302




  	setIcon(bigicon);
    	setMiniIcon(smallicon);

       	FXMenuBar *menubar;

        FXToolBarShell *dragshell1 = new FXToolBarShell(this, FRAME_RAISED);
        menubar = new FXMenuBar(this, dragshell1, FRAME_RAISED|LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
        new FXToolBarGrip(menubar, menubar, FXMenuBar::ID_TOOLBARGRIP);

       	FXStatusBar *statusbar;
	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER|FRAME_RAISED);

        filemenu = new FXMenuPane(this);
        new FXMenuCommand(filemenu, "&New\t\tCreate a new episode.", 0, this, ID_NEW);

  	FXHorizontalFrame *epframe =
   		new FXHorizontalFrame(contents, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_Y|LAYOUT_FILL_X,
   			0,0,0,0, 0,0,0,0, 0,0);
     	FXList *eplist = new FXList(epframe, 0, 0, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
	eplist->setNumVisible(10);
  	typedef vector<Episode>::const_iterator I;
	for (I i = v.begin(); i != v.end(); ++i) {
		const Episode& e = *i;
		FXString package = e.package;
		FXString name = e.name;
  		if (package.find(']') != -1)
			package = package.after(']').trim();
  		if (name.find(']') != -1)
			name = name.after(']').trim();
		FXString s = FXStringFormat("%s: %s (%s)", package.text(), name.text(), e.path.after(PATHSEP, -1).text());
		eplist->appendItem(s);

Lines 20-28 Link Here

(-)map.h.orig (+2 lines)
20	#define MAP_H	20	#define MAP_H
21		21
22	#include <vector>	22	#include <vector>
		23	using namespace std;
23		24
24	#include <fxdefs.h>	25	#include <fxdefs.h>
25	#include <FXString.h>	26	#include <FXString.h>
		27	using namespace FX;
26		28
27	#include "fxreptoned.h"	29	#include "fxreptoned.h"
28		30




	sprites = 0;
	currenttool = Sprite_Rock;
	leftbtn = false;
	horizontalScrollBar()->setLine(sprite_width);
	horizontalScrollBar()->setPage(sprite_width);
	verticalScrollBar()->setLine(sprite_height);
	verticalScrollBar()->setPage(sprite_height);
}

MapViewer::~MapViewer()

long MapViewer::onMotion(FXObject *, FXSelector, void *ptr)
{
	FXEvent *ev = (FXEvent *)ptr;
	int x = (ev->win_x + horizontalScrollBar()->getPosition()) / sprite_width;
	int y = (ev->win_y + verticalScrollBar()->getPosition()) / sprite_height;
	if (leftbtn && x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {
		if (ev->win_x < 0)
		    	setPosition(getXPosition() + sprite_width, getYPosition());

long MapViewer::onLeftBtnPress(FXObject *, FXSelector, void *ptr)
{
	FXEvent *ev = (FXEvent *)ptr;
	int x = (ev->win_x + horizontalScrollBar()->getPosition()) / sprite_width;
	int y = (ev->win_y + verticalScrollBar()->getPosition()) / sprite_height;
	if (x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {
		leftbtn = true;
		grab();




		    	    sprite_width+10, (sprite_height+5)*num_map_sprites + 5);
   	tools->create();

       	FXStatusBar *statusbar;
	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM|LAYOUT_FILL_X|STATUSBAR_WITH_DRAGCORNER|FRAME_RAISED);
  	pos_label = new FXLabel(statusbar, "", 0, FRAME_SUNKEN|LAYOUT_RIGHT|LAYOUT_CENTER_Y|LAYOUT_FIX_WIDTH, 0,0,50,0);

	FXVerticalFrame *contents =

	toolsview = new FXImageView(toolsframe, tools, this, ID_TOOLS, LAYOUT_FIX_WIDTH|LAYOUT_FILL_Y,
				  0,0,sprite_width+10+16,0);
	toolsview->setBackColor(FXRGB(0, 0, 0));
	toolsview->verticalScrollBar()->setLine(sprite_height + 5);

  	FXHorizontalFrame *mapframe =
   		new FXHorizontalFrame(contentsh, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_Y|LAYOUT_FILL_X,

	FXHorizontalFrame *mapsframe =
   		new FXHorizontalFrame(contentsh21, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y,
   			0,0,0,0, 0,0,0,0, 0,0);
   	maps_list = new FXList(mapsframe, this, ID_MAPSLIST, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
	maps_list->setNumVisible(20);

	new FXHorizontalFrame(contentsh22, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);
        map_ins = new FXButton(contentsh22, "&New\t\tInsert a new map.", 0, this, ID_MAPINS, FRAME_RAISED|FRAME_THICK);

  	FXHorizontalFrame *transframe =
   		new FXHorizontalFrame(contentsh23, FRAME_THICK|FRAME_SUNKEN|LAYOUT_FILL_X|LAYOUT_FILL_Y,
   			0,0,0,0, 0,0,0,0, 0,0);
   	trans_list = new FXList(transframe, this, ID_TRANSLIST, LIST_BROWSESELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y);
	trans_list->setNumVisible(20);

	new FXHorizontalFrame(contentsh24, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);
        trans_chg = new FXButton(contentsh24, "&Change\t\tChange the transporter destionation coordinates.", 0, this, ID_TRANSCHG, FRAME_RAISED|FRAME_THICK);

long MapWindow::onMapMouseMove(FXObject *, FXSelector, void *ptr)
{
  	FXEvent *ev = (FXEvent *)ptr;
	int x = (ev->win_x + mapview->horizontalScrollBar()->getPosition()) / sprite_width;
	int y = (ev->win_y + mapview->verticalScrollBar()->getPosition()) / sprite_height;
	Map *m = episode->maps[currentmap];
	if (x >= 0 && y >= 0 && x < m->width && y < m->height) {
		pos_label->setText(FXStringFormat("%d, %d", x+1, y+1));

{
  	FXEvent *ev = (FXEvent *)ptr;
	if (ev->win_x > 2 && ev->win_x < sprite_width + 4) {
		int y = ev->win_y + toolsview->verticalScrollBar()->getPosition();
		currenttool = (Sprite)(y / (sprite_height + 5));
  		currenttool = FXMIN(currenttool, Sprite_Spirit);
  		mapview->setTool(currenttool);

Return to bug 66302

Lines 70-83 Link Here

(-)mainwindow.cpp.orig (-9 / +10 lines)
70	setIcon(bigicon);	70	setIcon(bigicon);
71	setMiniIcon(smallicon);	71	setMiniIcon(smallicon);
72		72
73	FXMenubar *menubar;	73	FXMenuBar *menubar;
74		74
75	FXToolbarShell *dragshell1 = new FXToolbarShell(this, FRAME_RAISED);	75	FXToolBarShell *dragshell1 = new FXToolBarShell(this, FRAME_RAISED);
76	menubar = new FXMenubar(this, dragshell1, FRAME_RAISED\|LAYOUT_SIDE_TOP\|LAYOUT_FILL_X);	76	menubar = new FXMenuBar(this, dragshell1, FRAME_RAISED\|LAYOUT_SIDE_TOP\|LAYOUT_FILL_X);
77	new FXToolbarGrip(menubar, menubar, FXMenubar::ID_TOOLBARGRIP);	77	new FXToolBarGrip(menubar, menubar, FXMenuBar::ID_TOOLBARGRIP);
78		78
79	FXStatusbar *statusbar;	79	FXStatusBar *statusbar;
80	statusbar = new FXStatusbar(this, LAYOUT_SIDE_BOTTOM\|LAYOUT_FILL_X\|STATUSBAR_WITH_DRAGCORNER\|FRAME_RAISED);	80	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM\|LAYOUT_FILL_X\|STATUSBAR_WITH_DRAGCORNER\|FRAME_RAISED);
81		81
82	filemenu = new FXMenuPane(this);	82	filemenu = new FXMenuPane(this);
83	new FXMenuCommand(filemenu, "&New\t\tCreate a new episode.", 0, this, ID_NEW);	83	new FXMenuCommand(filemenu, "&New\t\tCreate a new episode.", 0, this, ID_NEW);
Lines 478-492 Link Here
478	FXHorizontalFrame *epframe =	478	FXHorizontalFrame *epframe =
479	new FXHorizontalFrame(contents, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_Y\|LAYOUT_FILL_X,	479	new FXHorizontalFrame(contents, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_Y\|LAYOUT_FILL_X,
480	0,0,0,0, 0,0,0,0, 0,0);	480	0,0,0,0, 0,0,0,0, 0,0);
481	FXList *eplist = new FXList(epframe, 10, 0, 0, LIST_BROWSESELECT\|LAYOUT_FILL_X\|LAYOUT_FILL_Y);	481	FXList *eplist = new FXList(epframe, 0, 0, LIST_BROWSESELECT\|LAYOUT_FILL_X\|LAYOUT_FILL_Y);
		482	eplist->setNumVisible(10);
482	typedef vector<Episode>::const_iterator I;	483	typedef vector<Episode>::const_iterator I;
483	for (I i = v.begin(); i != v.end(); ++i) {	484	for (I i = v.begin(); i != v.end(); ++i) {
484	const Episode& e = *i;	485	const Episode& e = *i;
485	FXString package = e.package;	486	FXString package = e.package;
486	FXString name = e.name;	487	FXString name = e.name;
487	if (package.findf(']') != -1)	488	if (package.find(']') != -1)
488	package = package.after(']').trim();	489	package = package.after(']').trim();
489	if (name.findf(']') != -1)	490	if (name.find(']') != -1)
490	name = name.after(']').trim();	491	name = name.after(']').trim();
491	FXString s = FXStringFormat("%s: %s (%s)", package.text(), name.text(), e.path.after(PATHSEP, -1).text());	492	FXString s = FXStringFormat("%s: %s (%s)", package.text(), name.text(), e.path.after(PATHSEP, -1).text());
492	eplist->appendItem(s);	493	eplist->appendItem(s);

Lines 42-51 Link Here

(-)mapviewer.cpp.orig (-8 / +8 lines)
42	sprites = 0;	42	sprites = 0;
43	currenttool = Sprite_Rock;	43	currenttool = Sprite_Rock;
44	leftbtn = false;	44	leftbtn = false;
45	horizontalScrollbar()->setLine(sprite_width);	45	horizontalScrollBar()->setLine(sprite_width);
46	horizontalScrollbar()->setPage(sprite_width);	46	horizontalScrollBar()->setPage(sprite_width);
47	verticalScrollbar()->setLine(sprite_height);	47	verticalScrollBar()->setLine(sprite_height);
48	verticalScrollbar()->setPage(sprite_height);	48	verticalScrollBar()->setPage(sprite_height);
49	}	49	}
50		50
51	MapViewer::~MapViewer()	51	MapViewer::~MapViewer()
Lines 166-173 Link Here
166	long MapViewer::onMotion(FXObject , FXSelector, void ptr)	166	long MapViewer::onMotion(FXObject , FXSelector, void ptr)
167	{	167	{
168	FXEvent ev = (FXEvent )ptr;	168	FXEvent ev = (FXEvent )ptr;
169	int x = (ev->win_x + horizontalScrollbar()->getPosition()) / sprite_width;	169	int x = (ev->win_x + horizontalScrollBar()->getPosition()) / sprite_width;
170	int y = (ev->win_y + verticalScrollbar()->getPosition()) / sprite_height;	170	int y = (ev->win_y + verticalScrollBar()->getPosition()) / sprite_height;
171	if (leftbtn && x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {	171	if (leftbtn && x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {
172	if (ev->win_x < 0)	172	if (ev->win_x < 0)
173	setPosition(getXPosition() + sprite_width, getYPosition());	173	setPosition(getXPosition() + sprite_width, getYPosition());
Lines 186-193 Link Here
186	long MapViewer::onLeftBtnPress(FXObject , FXSelector, void ptr)	186	long MapViewer::onLeftBtnPress(FXObject , FXSelector, void ptr)
187	{	187	{
188	FXEvent ev = (FXEvent )ptr;	188	FXEvent ev = (FXEvent )ptr;
189	int x = (ev->win_x + horizontalScrollbar()->getPosition()) / sprite_width;	189	int x = (ev->win_x + horizontalScrollBar()->getPosition()) / sprite_width;
190	int y = (ev->win_y + verticalScrollbar()->getPosition()) / sprite_height;	190	int y = (ev->win_y + verticalScrollBar()->getPosition()) / sprite_height;
191	if (x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {	191	if (x >= 0 && y >= 0 && x < map->width && y < map->height && map->xy(x, y) != currenttool) {
192	leftbtn = true;	192	leftbtn = true;
193	grab();	193	grab();

Lines 55-62 Link Here

(-)mapwindow.cpp.orig (-8 / +10 lines)
55	sprite_width+10, (sprite_height+5)*num_map_sprites + 5);	55	sprite_width+10, (sprite_height+5)*num_map_sprites + 5);
56	tools->create();	56	tools->create();
57		57
58	FXStatusbar *statusbar;	58	FXStatusBar *statusbar;
59	statusbar = new FXStatusbar(this, LAYOUT_SIDE_BOTTOM\|LAYOUT_FILL_X\|STATUSBAR_WITH_DRAGCORNER\|FRAME_RAISED);	59	statusbar = new FXStatusBar(this, LAYOUT_SIDE_BOTTOM\|LAYOUT_FILL_X\|STATUSBAR_WITH_DRAGCORNER\|FRAME_RAISED);
60	pos_label = new FXLabel(statusbar, "", 0, FRAME_SUNKEN\|LAYOUT_RIGHT\|LAYOUT_CENTER_Y\|LAYOUT_FIX_WIDTH, 0,0,50,0);	60	pos_label = new FXLabel(statusbar, "", 0, FRAME_SUNKEN\|LAYOUT_RIGHT\|LAYOUT_CENTER_Y\|LAYOUT_FIX_WIDTH, 0,0,50,0);
61		61
62	FXVerticalFrame *contents =	62	FXVerticalFrame *contents =
Lines 75-81 Link Here
75	toolsview = new FXImageView(toolsframe, tools, this, ID_TOOLS, LAYOUT_FIX_WIDTH\|LAYOUT_FILL_Y,	75	toolsview = new FXImageView(toolsframe, tools, this, ID_TOOLS, LAYOUT_FIX_WIDTH\|LAYOUT_FILL_Y,
76	0,0,sprite_width+10+16,0);	76	0,0,sprite_width+10+16,0);
77	toolsview->setBackColor(FXRGB(0, 0, 0));	77	toolsview->setBackColor(FXRGB(0, 0, 0));
78	toolsview->verticalScrollbar()->setLine(sprite_height + 5);	78	toolsview->verticalScrollBar()->setLine(sprite_height + 5);
79		79
80	FXHorizontalFrame *mapframe =	80	FXHorizontalFrame *mapframe =
81	new FXHorizontalFrame(contentsh, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_Y\|LAYOUT_FILL_X,	81	new FXHorizontalFrame(contentsh, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_Y\|LAYOUT_FILL_X,
Lines 109-115 Link Here
109	FXHorizontalFrame *mapsframe =	109	FXHorizontalFrame *mapsframe =
110	new FXHorizontalFrame(contentsh21, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_X\|LAYOUT_FILL_Y,	110	new FXHorizontalFrame(contentsh21, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_X\|LAYOUT_FILL_Y,
111	0,0,0,0, 0,0,0,0, 0,0);	111	0,0,0,0, 0,0,0,0, 0,0);
112	maps_list = new FXList(mapsframe, 20, this, ID_MAPSLIST, LIST_BROWSESELECT\|LAYOUT_FILL_X\|LAYOUT_FILL_Y);	112	maps_list = new FXList(mapsframe, this, ID_MAPSLIST, LIST_BROWSESELECT\|LAYOUT_FILL_X\|LAYOUT_FILL_Y);
		113	maps_list->setNumVisible(20);
113		114
114	new FXHorizontalFrame(contentsh22, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);	115	new FXHorizontalFrame(contentsh22, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);
115	map_ins = new FXButton(contentsh22, "&New\t\tInsert a new map.", 0, this, ID_MAPINS, FRAME_RAISED\|FRAME_THICK);	116	map_ins = new FXButton(contentsh22, "&New\t\tInsert a new map.", 0, this, ID_MAPINS, FRAME_RAISED\|FRAME_THICK);
Lines 124-130 Link Here
124	FXHorizontalFrame *transframe =	125	FXHorizontalFrame *transframe =
125	new FXHorizontalFrame(contentsh23, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_X\|LAYOUT_FILL_Y,	126	new FXHorizontalFrame(contentsh23, FRAME_THICK\|FRAME_SUNKEN\|LAYOUT_FILL_X\|LAYOUT_FILL_Y,
126	0,0,0,0, 0,0,0,0, 0,0);	127	0,0,0,0, 0,0,0,0, 0,0);
127	trans_list = new FXList(transframe, 20, this, ID_TRANSLIST, LIST_BROWSESELECT\|LAYOUT_FILL_X\|LAYOUT_FILL_Y);	128	trans_list = new FXList(transframe, this, ID_TRANSLIST, LIST_BROWSESELECT\|LAYOUT_FILL_X\|LAYOUT_FILL_Y);
		129	trans_list->setNumVisible(20);
128		130
129	new FXHorizontalFrame(contentsh24, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);	131	new FXHorizontalFrame(contentsh24, LAYOUT_FILL_Y, 0,0,0,0, 0,0,0,0, 0,0);
130	trans_chg = new FXButton(contentsh24, "&Change\t\tChange the transporter destionation coordinates.", 0, this, ID_TRANSCHG, FRAME_RAISED\|FRAME_THICK);	132	trans_chg = new FXButton(contentsh24, "&Change\t\tChange the transporter destionation coordinates.", 0, this, ID_TRANSCHG, FRAME_RAISED\|FRAME_THICK);
Lines 222-229 Link Here
222	long MapWindow::onMapMouseMove(FXObject , FXSelector, void ptr)	224	long MapWindow::onMapMouseMove(FXObject , FXSelector, void ptr)
223	{	225	{
224	FXEvent ev = (FXEvent )ptr;	226	FXEvent ev = (FXEvent )ptr;
225	int x = (ev->win_x + mapview->horizontalScrollbar()->getPosition()) / sprite_width;	227	int x = (ev->win_x + mapview->horizontalScrollBar()->getPosition()) / sprite_width;
226	int y = (ev->win_y + mapview->verticalScrollbar()->getPosition()) / sprite_height;	228	int y = (ev->win_y + mapview->verticalScrollBar()->getPosition()) / sprite_height;
227	Map *m = episode->maps[currentmap];	229	Map *m = episode->maps[currentmap];
228	if (x >= 0 && y >= 0 && x < m->width && y < m->height) {	230	if (x >= 0 && y >= 0 && x < m->width && y < m->height) {
229	pos_label->setText(FXStringFormat("%d, %d", x+1, y+1));	231	pos_label->setText(FXStringFormat("%d, %d", x+1, y+1));
Lines 235-241 Link Here
235	{	237	{
236	FXEvent ev = (FXEvent )ptr;	238	FXEvent ev = (FXEvent )ptr;
237	if (ev->win_x > 2 && ev->win_x < sprite_width + 4) {	239	if (ev->win_x > 2 && ev->win_x < sprite_width + 4) {
238	int y = ev->win_y + toolsview->verticalScrollbar()->getPosition();	240	int y = ev->win_y + toolsview->verticalScrollBar()->getPosition();
239	currenttool = (Sprite)(y / (sprite_height + 5));	241	currenttool = (Sprite)(y / (sprite_height + 5));
240	currenttool = FXMIN(currenttool, Sprite_Spirit);	242	currenttool = FXMIN(currenttool, Sprite_Spirit);
241	mapview->setTool(currenttool);	243	mapview->setTool(currenttool);