Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6600 → Rev 6597

/programs/cmm/eolite/include/copy.h
25,7 → 25,7
strcpy(#copy_t, #path);
strcat(#copy_t, file_mas[i]*304+buf+72);
path_len = strlen(#copy_t);
size_buf = size_buf + path_len + 4;
size_buf = size_buf + path_len;
}
}
41,9 → 41,8
strcpy(#copy_t, #path);
strcat(#copy_t, file_mas[i]*304+buf+72);
path_len = strlen(#copy_t);
ESDWORD[buff_data+10+buffer_len] = path_len;
strlcpy(buff_data+10+4+buffer_len, #copy_t, path_len);
buffer_len = buffer_len + 4 + path_len;
strlcpy(buff_data+10+buffer_len+1, #copy_t, path_len);
buffer_len = buffer_len + path_len;
ind++;
}
}
51,19 → 50,18
}
else
{
path_len = strlen(#file_path)+4;
buff_data = malloc(path_len);
ESDWORD[buff_data] = path_len;
buff_data = malloc(4106);
ESDWORD[buff_data] = 4106;
ESDWORD[buff_data+4] = 3;
ESINT[buff_data+8] = 1;
ESDWORD[buff_data+10] = path_len;
strlcpy(buff_data+14, #file_path, path_len);;
clipboard.SetSlotData(path_len+10, buff_data);
strlcpy(buff_data+10, #file_path, 4096);;
clipboard.SetSlotData(4106, buff_data);
}
cut_active = cut;
free(buff_data);
}
 
 
void Paste() {
copy_stak = malloc(64000);
CreateThread(#PasteThread,copy_stak+64000-4);
84,9 → 82,9
if (DSDWORD[buf+4] != 3) return;
cnt = ESINT[buf+8];
for (j = 0; j < cnt; j++) {
path_len = ESDWORD[buf+10+buffer_len];
strlcpy(#copy_from, buf+10+buffer_len+4, path_len);
buffer_len = buffer_len + 4 + path_len;
if (j==0) strlcpy(#copy_from, buf+10+buffer_len);
else strlcpy(#copy_from, buf+10+buffer_len+1);
buffer_len = buffer_len + path_len;
GetFileInfo(#copy_from, #file_info_count);
if ( file_info_count.isfolder ) DirFileCount(#copy_from);
else file_count_copy++;
100,9 → 98,10
buffer_len = 0;
DisplayOperationForm();
for (j = 0; j < cnt; j++) {
path_len = ESDWORD[buf+10+buffer_len];
strlcpy(#copy_from, buf+10+buffer_len+4, path_len);
buffer_len = buffer_len + 4 + path_len;
if (j==0) strlcpy(#copy_from, buf+10+buffer_len);
else strlcpy(#copy_from, buf+10+buffer_len+1);
path_len = strlen(#copy_from);
buffer_len = buffer_len + path_len;
if (!copy_from) DialogExit();
strcpy(#copy_to, #path);
strcat(#copy_to, #copy_from+strrchr(#copy_from,'/'));
158,7 → 157,7
strcpy(#copy_t, #path);
strcat(#copy_t, file_mas[i]*304+buf+72);
path_len = strlen(#copy_t);
size_buf = size_buf + path_len;
size_buf = size_buf + path_len + 4;
}
}
174,8 → 173,9
strcpy(#copy_t, #path);
strcat(#copy_t, file_mas[i]*304+buf+72);
path_len = strlen(#copy_t);
strlcpy(buff_data+10+buffer_len+1, #copy_t, path_len);
buffer_len = buffer_len + path_len;
ESDWORD[buff_data+10+buffer_len] = path_len;
strlcpy(buff_data+10+4+buffer_len, #copy_t, path_len);
buffer_len = buffer_len + 4 + path_len;
ind++;
}
}
195,11 → 195,6
}
 
 
void Paste() {
copy_stak = malloc(64000);
CreateThread(#PasteThread,copy_stak+64000-4);
}
 
void PasteThread()
{
char copy_rezult;
210,14 → 205,14
dword buffer_len = 0;
file_count_copy = 0;
copy_bar.value = 0;
debugln("Step 1");
buf = clipboard.GetSlotData(clipboard.GetSlotCount()-1);
if (DSDWORD[buf+4] != 3) return;
cnt = ESINT[buf+8];
for (j = 0; j < cnt; j++) {
if (j==0) strlcpy(#copy_from, buf+10+buffer_len);
else strlcpy(#copy_from, buf+10+buffer_len+1);
buffer_len = buffer_len + path_len;
path_len = ESDWORD[buf+10+buffer_len];
strlcpy(#copy_from, buf+10+buffer_len+4, path_len);
buffer_len = buffer_len + 4 + path_len;
GetFileInfo(#copy_from, #file_info_count);
if ( file_info_count.isfolder ) DirFileCount(#copy_from);
else file_count_copy++;
227,20 → 222,13
if (cut_active) operation_flag = MOVE_FLAG;
else operation_flag = COPY_FLAG;
debugln("Step 2");
path_len = 0;
buffer_len = 0;
DisplayOperationForm();
for (j = 0; j < cnt; j++) {
if (j==0) strlcpy(#copy_from, buf+10+buffer_len);
else strlcpy(#copy_from, buf+10+buffer_len+1);
debugln(#copy_from);
path_len = strlen(#copy_from);
debugi(path_len);
debug("Step ");
debugi(j);
debugln(" ");
buffer_len = buffer_len + path_len;
path_len = ESDWORD[buf+10+buffer_len];
strlcpy(#copy_from, buf+10+buffer_len+4, path_len);
buffer_len = buffer_len + 4 + path_len;
if (!copy_from) DialogExit();
strcpy(#copy_to, #path);
strcat(#copy_to, #copy_from+strrchr(#copy_from,'/'));
267,7 → 255,6
}
}
debugln("Step 3000");
if (cut_active)
{
cut_active=false;
274,6 → 261,5
}
if (info_after_copy) notify(INFO_AFTER_COPY);
DialogExit();
}*/
 
 
}
*/
/programs/cmm/eolite/include/properties.h
353,26 → 353,6
void DrawPropertiesWindow()
{
DefineAndDrawWindow(Form.left + 150,150,305,360+skin_height,0x34,system.color.work,WINDOW_TITLE_PROPERTIES);
if ( !asm test path_to_file_ed.flags, 2)
{
path_to_file_ed.blur_border_color = system.color.work;
path_to_file_ed.color = system.color.work;
}
else
{
path_to_file_ed.blur_border_color = 0x000000;
path_to_file_ed.color = 0xffffff;
}
if ( !asm test path_to_file_ed.flags, 2)
{
file_name_ed.blur_border_color = system.color.work;
file_name_ed.color = system.color.work;
}
else
{
file_name_ed.blur_border_color = 0x000000;
file_name_ed.color = 0xffffff;
}
GetProcessInfo(#settings_form, SelfInfo);
DrawFlatButton(10, 5, 80, 24, 12, TAB_T_BASIC);
if (exif_load==1) DrawFlatButton(92, 5, 80, 24, 13, TAB_T_DETAILS);