Subversion Repositories Kolibri OS

Rev

Rev 9349 | Rev 9361 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 9349 Rev 9356
Line 54... Line 54...
54
	dword volume_label;
54
	dword volume_label;
55
	for (i=0; devinfo[i]!=0; i+=3) {
55
	for (i=0; devinfo[i]!=0; i+=3) {
56
		if (!strncmp(dev_name+1, devinfo[i], 2)) {
56
		if (!strncmp(dev_name+1, devinfo[i], 2)) {
57
			ESBYTE[icon] = devinfo[i+1];
57
			ESBYTE[icon] = devinfo[i+1];
58
			if (volume_label = GetVolumeLabel(dev_name)) 
58
			if (ESBYTE[icon]==4)
59
			{
59
			{
60
				//show label only for hard disk drives
60
				//show label only for hard disk drives
61
				if (ESBYTE[icon]==4) {
61
				if (volume_label = GetVolumeLabel(dev_name)) {
62
					strncpy(disc_name, volume_label, 15);
62
					strncpy(disc_name, volume_label, 15);
63
					chrcat(disc_name, ' ');
63
					chrcat(disc_name, ' ');
64
					return;					
64
					return;					
65
				}
65
				}
66
			}
66
			}
67
			strcpy(disc_name, devinfo[i+2]);
67
			strcpy(disc_name, devinfo[i+2]);
Line 100... Line 100...
100
			{
100
			{
101
				if (dev_name[1]=='t') {
101
				if (dev_name[1]=='t') {
102
					chrcat(#disc_name, dev_name[4]);
102
					chrcat(#disc_name, dev_name[4]);
103
				} else if (dev_name[1]=='f') {
103
				} else if (dev_name[1]=='f') {
104
					//
104
					if (dev_name[3]!='/') chrcat(#disc_name, dev_name[3]);
105
				} else {
105
				} else {
106
					strcat(#disc_name, #dev_name);
106
					strcat(#disc_name, #dev_name);
107
				}
107
				}
108
				if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#disc_name);
108
				if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#disc_name);
109
				WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name);
109
				WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name);
110
				//if (is_active) kfont.bold = true;
110
				//if (is_active) kfont.bold = true;