Subversion Repositories Kolibri OS

Rev

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

Rev 9277 Rev 9349
Line 47... Line 47...
47 
	free(devbuf);
 47 
	free(devbuf);
48 
	free(diskbuf);
 48 
	free(diskbuf);
49 
}
 49 
}
50 
 
 50 
 
Line 51... Line 51...
51 
void GetDiskIconAndName(dword dev_name, dev_icon, disc_name)
 51 
void GetDiskIconAndName(dword dev_name, icon, disc_name)
52 
{
 52 
{
53 
	int i;
 53 
	int i;
- 
 
 54 
	dword volume_label;
54 
	for (i=0; devinfo[i]!=0; i+=3) {
 55 
	for (i=0; devinfo[i]!=0; i+=3) {
55 
		if (!strncmp(dev_name+1, devinfo[i], 2)) {
 56 
		if (!strncmp(dev_name+1, devinfo[i], 2)) {
56 
			ESBYTE[dev_icon] = devinfo[i+1];
 57 
			ESBYTE[icon] = devinfo[i+1];
- 
 
 58 
			if (volume_label = GetVolumeLabel(dev_name))
- 
 
 59 
			{
- 
 
 60 
				//show label only for hard disk drives
- 
 
 61 
				if (ESBYTE[icon]==4) {
- 
 
 62 
					strncpy(disc_name, volume_label, 15);
- 
 
 63 
					chrcat(disc_name, ' ');
- 
 
 64 
					return;
- 
 
 65 
				}
- 
 
 66 
			}
57 
			strcpy(disc_name, devinfo[i+2]);
 67 
			strcpy(disc_name, devinfo[i+2]);
58 
			return;
 68 
			return;
59 
		}
 69 
		}
60 
	}
 70 
	}
61 
	ESBYTE[dev_icon]=5;
 71 
	ESBYTE[icon]=4;
62 
	strcpy(disc_name, T_UNC);
 72 
	strcpy(disc_name, T_UNC);
63 
}
 73 
}
Line 64... Line 74...
64 
 
 74 
 
65 
void _SystemDiscs::Draw()
 75 
void _SystemDiscs::Draw()
Line 87... Line 97...
87 
			DrawBar(draw_x+6+18,draw_y,160-6-18,DEV_H+1,0xFFFFFF);
 97 
			DrawBar(draw_x+6+18,draw_y,160-6-18,DEV_H+1,0xFFFFFF);
88 
			DefineHiddenButton(draw_x,draw_y,159,16,100+i);
 98 
			DefineHiddenButton(draw_x,draw_y,159,16,100+i);
89 
			if (show_dev_name.checked)
 99 
			if (show_dev_name.checked)
90 
			{
 100 
			{
91 
				strcat(#disc_name, #dev_name);
 101 
				if (dev_name[1]=='t') {
- 
 
 102 
					chrcat(#disc_name, dev_name[4]);
- 
 
 103 
				} else if (dev_name[1]=='f') {
- 
 
 104 
					//
- 
 
 105 
				} else {
- 
 
 106 
					strcat(#disc_name, #dev_name);
92 
				if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#disc_name);
 107 
				}
- 
 
 108 
				if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#disc_name);
93 
				WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name);
 109 
				WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name);
94 
				//if (is_active) kfont.bold = true;
 110 
				//if (is_active) kfont.bold = true;
95 
				//kfont.WriteIntoWindow(draw_x + 29, draw_y+2, 0xFFFfff, 0x000000, kfont.size.pt, #disc_name);
 111 
				//kfont.WriteIntoWindow(draw_x + 29, draw_y+2, 0xFFFfff, 0x000000, kfont.size.pt, #disc_name);
96 
				//kfont.bold = false;
 112 
				//kfont.bold = false;
97 
			} else {
 113 
			} else {