WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 8825 → Rev 8826

/data/common/KolibriNext/icons16.PNG
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /data/common/settings/app.ini
 ,12 → 5,12
 [Eolite]
 ShowDeviceName=1
 ShowStatusBar=1
-LineHeight=20
+LineHeight=23
 [EFM]
 ShowDeviceName=1
 ShowStatusBar=1
-LineHeight=18
+LineHeight=21
 [Kiv]
 Next=PgDn

 /data/common/settings/games.ini
 ,9 → 44,9
 Descent=games/descent
 [3D Shooter]
+Wolf3D=/kg/wolf3d/wolf3d,126
+DOOM1=/kg/doom1/doom,43
 Quake=/kg/quake/sdlquake,56
-DOOM1=/kg/doom1/doom,43
-Wolf3D=/kg/wolf3d/wolf3d,126
 [Logical]
 Clicks=games/clicks,18

 /data/rus/settings/games.ini
 ,9 → 44,9
 Descent=games/descent
 [3D ãâ¥àë]
+Wolf3D=/kg/wolf3d/wolf3d,126
+DOOM1=/kg/doom1/doom,43
 Quake=/kg/quake/sdlquake,56
-DOOM1=/kg/doom1/doom,43
-Wolf3D=/kg/wolf3d/wolf3d,126
 [®£¨ç¥áª¨¥]
 Clicks=games/clicks,18

/programs/cmm/template/compile_en.bat
File deleted
\ No newline at end of file

/programs/cmm/template/Tupfile.lua
File deleted

/programs/cmm/template/template.c
File deleted

 /programs/cmm/eolite/Eolite.c
 ,8 → 3,8
 // 70.5 - get volume info and label
-#define TITLE "Eolite File Manager 4.70"
-#define ABOUT_TITLE "EOLITE 4.70"
+#define TITLE "Eolite File Manager 4.80"
+#define ABOUT_TITLE "EOLITE 4.80"
 #ifndef AUTOBUILD
 #include "lang.h--"
 ,6 → 655,8
 void DrawFilePanels()
 {
         int files_y;
+        int w2 = -Form.cwidth-1/2+Form.cwidth;
+        int h2;
         if (!two_panels.checked)
         {
                 DrawDeviceAndActionsLeftPanel();
 ,6 → 672,7
                 col.selec = col.selec_inactive;
                 SystemDiscs.Draw();
                 files_y = files.y;
+                h2 = Form.cheight-files_y-2 - status_bar_h;
                 if (active_panel==1)
                 {
 ,25 → 679,25
                         llist_copy(#files, #files_inactive);
                         strcpy(#path, #inactive_path);
                         col.selec = col.selec_inactive; //this is a bad code: need to use some var to set inactive panel for DrawList();
-                        files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
+                        files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
                         DrawList();
                         Open_Dir(#path,WITH_REDRAW);
                         llist_copy(#files, #files_active);
                         strcpy(#path, #active_path);
                         col.selec = col.selec_active;
-                        files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
+                        files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
                         DrawList();
                         Open_Dir(#path,WITH_REDRAW);
                 }
                 if (active_panel==2)
                 {
-                        files.SetSizes(2, files_y, Form.cwidth/2-2-17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
+                        files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
                         DrawList();
                         Open_Dir(#path,WITH_REDRAW);
                         llist_copy(#files, #files_active);
                         strcpy(#path, #active_path);
                         col.selec = col.selec_active;
-                        files.SetSizes(Form.cwidth/2, files_y, Form.cwidth/2 -17, Form.cheight-files_y-2 - status_bar_h, files.item_h);
+                        files.SetSizes(Form.cwidth/2, files_y, w2 -17, h2, files.item_h);
                         DrawList();
                         Open_Dir(#path,WITH_REDRAW);
                 }

 /programs/cmm/eolite/include/copy_and_delete.h
 ,7 → 109,7
 void PasteThread()
 {
         char copy_rezult;
-        int j;
+        int j, i, slash_count=0;
         int paste_elements_count = 0;
         dword buf;
         dword path_offset;
 ,7 → 125,26
                 DisplayOperationForm(COPY_FLAG);
         }
+        if (cut_active) {
         for (j = 0; j < paste_elements_count; j++) {
+                        sprintf(#copy_to, "%s/%s", #path, path_offset+strrchr(path_offset,'/'));
+                        slash_count = 0;
+                        for (i=0; i<=10; i++) {
+                                if (copy_to[i]=='/') slash_count++;
+                                if (slash_count==3) break;
+                        }
+                        if (strncmp(#copy_to, path_offset, i)!=0) goto _DIFFERENT_DRIVES;
+                        RenameMove(#copy_to+i, path_offset);
+                        if (EAX!=0) goto _DIFFERENT_DRIVES;
+                        path_offset += strlen(path_offset) + 1;
+                }
+                cut_active=false;
+                DialogExit();
+        }
+_DIFFERENT_DRIVES:
+        path_offset = buf + 10;
+        for (j = 0; j < paste_elements_count; j++) {
                 copy_bar.max += GetFilesCount(path_offset);
                 path_offset += strlen(path_offset) + 1;
         }

 /programs/cmm/eolite/include/icons.h
 ,8 → 21,6
                 default_icon=2;
         }
-        //KolibriNext
-        /*
         if (chrnum(file_path, '/')==2) {
                 if (ESBYTE[file_path+1]=='/') ext[0] = ESBYTE[file_path+2];
                         else ext[0] = ESBYTE[file_path+1];
 ,9 → 32,7
                         icons_ini.section = "drives16";
                         icon_n = icons_ini.GetInt(#ext, 50);
                 }
-        } else
-        */
-        if (extension) {
+        } else if (extension) {
                 strcpy(#ext, extension);
                 strlwr(#ext);
                 icon_n = icons_ini.GetInt(#ext, default_icon);

 /programs/cmm/eolite/include/left_panel.h
 ,8 → 3,8
         ?define T_DEVICES "áâà®©áâ¢ "
         ?define T_ACTIONS "¥©áâ¢¨ï"
         char *actions[] = {
-, "®¢ë© ä ©«", "F7",
-, "®¢ ï ¯ ¯ª ", "F6",
+, "®¢ë© ä ©«", "F9",
+, "®¢ ï ¯ ¯ª ", "F7",
 , " áâà®©ª¨", "F10",
 ,0,0
         };
 ,8 → 21,8
         ?define T_DEVICES "Devices"
         ?define T_ACTIONS "Actions"
         char *actions[] = {
-, "New file", "F7",
-, "New folder", "F6",
+, "New file", "F9",
+, "New folder", "F7",
 , "Settings", "F10",
 ,0,0
         };

 /programs/cmm/eolite/include/menu.h
 ,7 → 79,7
 Paste        |Crl+V
 -
 Delete       |Del
-Properties   |F8";
+Properties   |F1";
 char empty_folder_actions[]=
 "Paste        |Crl+V";
 char burger_menu_items[] =

 /programs/cmm/eolite/include/settings.h
 ,13 → 155,13
         show_status_bar.checked = ini.GetInt("ShowStatusBar", true);
         big_icons.checked       = ini.GetInt("BigIcons", false); BigIconsSwitch();
         //two_panels.checked      = ini.GetInt("TwoPanels", false);
-        colored_lines.checked   = ini.GetInt("ColoredLines", efm);
+        colored_lines.checked   = ini.GetInt("ColoredLines", true);
         kfont.size.pt   = ini.GetInt("FontSize", 13);
         files.item_h    = ini.GetInt("LineHeight", 19);
         Form.left   = ini.GetInt("WinX", 100);
         Form.top    = ini.GetInt("WinY", 30);
         Form.width  = ini.GetInt("WinW", efm*170+550);
-        Form.height = ini.GetInt("WinH", efm*116+503);
+        Form.height = ini.GetInt("WinH", efm*100+517);
         ini.GetString("DefaultPath", #path, 4096, "/rd/1");
         ini.GetString("DefaultPath", #path_start, 4096, "/rd/1");
         path_start_ed.size = path_start_ed.pos = strlen(#path_start);

/skins/_old/mygrey/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/mygrey/default.asm
File deleted
\ No newline at end of file

/skins/_old/mygrey/build.bat
File deleted
\ No newline at end of file

/skins/_old/mygrey/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/mygrey/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/mygrey/Tupfile.lua
File deleted

/skins/_old/mygrey/gray.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/mygrey/skin.inc
File deleted

/skins/_old/myskin1/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin1/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin1/Tupfile.lua
File deleted

/skins/_old/myskin1/skin.inc
File deleted

/skins/_old/myskin1/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin1/default.asm
File deleted
\ No newline at end of file

/skins/_old/myskin1/myblue.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin3/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin3/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin3/Tupfile.lua
File deleted

/skins/_old/myskin3/skin.inc
File deleted

/skins/_old/myskin3/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin3/default.asm
File deleted
\ No newline at end of file

/skins/_old/myskin3/myblue.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin4/Tupfile.lua
File deleted

/skins/_old/myskin4/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin4/skin.inc
File deleted

/skins/_old/myskin4/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin4/default.asm
File deleted
\ No newline at end of file

/skins/_old/myskin4/build.bat
File deleted
\ No newline at end of file

/skins/_old/myskin4/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/myskin4/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/pack_build.bat
File deleted

/skins/_old/gliteskin/gliteskin_glider/oper_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/default.asm
File deleted

/skins/_old/gliteskin/gliteskin_glider/left_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/base_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/gliteskin/gliteskin_glider/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/nix_medium.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_medium/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/nix/nix_big/nix_big.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

 /skins/skinlist.lua
 ,7 → 44,6
 "_old/first_skin/first_skin.skn",
 "_old/Flyght/Flyght.skn",
 "_old/gliteskin/gliteskin_deepsky/gliteskin_deepsky.skn",
-"_old/gliteskin/gliteskin_glider/gliteskin_glider.skn",
 "_old/gliteskin/gliteskin_red/gliteskin_red.skn",
 "_old/gnome_style/gnome_blue/gnome_blue.skn",
 "_old/gnome_style/gnome_green/gnome_green.skn",
 ,17 → 73,11
 "_old/mist/mist.skn",
 "_old/mist_color/mist_color.skn",
 "_old/mursky/mursky.skn",
-"_old/mygrey/mygrey.skn",
-"_old/myskin1/myskin1.skn",
-"_old/myskin3/myskin3.skn",
-"_old/myskin4/myskin4.skn",
 "_old/MyTango/MyTango.skn",
 "_old/Nature/Nature.skn",
 "_old/neutral/neutral_blue/neutral_blue.skn",
 "_old/neutral/neutral_green/neutral_green.skn",
 "_old/neutral/neutral_lilac/neutral_lilac.skn",
-"_old/nix/nix_big/nix_big.skn",
-"_old/nix/nix_medium/nix_medium.skn",
 "_old/nix/nix_small/nix_small.skn",
 "_old/Nova_skins/Nova_blue/Nova_blue.skn",
 "_old/OpusOs_Blue/OpusOs_Blue.skn",

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8825 → Rev 8826