forked from KolibriOS/kolibrios
eolite: fixed the case that after deletion the copy function worked as move
git-svn-id: svn://kolibrios.org@8871 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
74086b0d2c
commit
ba2ee17f68
@ -3,9 +3,9 @@
|
||||
|
||||
// 70.5 - get volume info and label
|
||||
|
||||
#define ABOUT_TITLE "EOLITE 5 Beta3"
|
||||
#define TITLE_EOLITE "Eolite File Manager 5 Beta3"
|
||||
#define TITLE_KFM "Kolibri File Manager 2 Beta3";
|
||||
#define ABOUT_TITLE "EOLITE 5 Beta4"
|
||||
#define TITLE_EOLITE "Eolite File Manager 5 Beta4"
|
||||
#define TITLE_KFM "Kolibri File Manager 2 Beta4";
|
||||
|
||||
#ifndef AUTOBUILD
|
||||
#include "lang.h--"
|
||||
@ -1260,7 +1260,6 @@ void EventSelectFileByKeyPress()
|
||||
dword GetDeviceSizeLabel(dword path)
|
||||
{
|
||||
BDVK bdvk;
|
||||
char cdname[8];
|
||||
if (ESBYTE[path+1] == '/') path++;
|
||||
if (ESBYTE[path+1] == 'c') && (ESBYTE[path+2] == 'd')
|
||||
&& (ESBYTE[path+4] == 0) return 0;
|
||||
|
@ -57,7 +57,7 @@ void CopyFilesListToClipboard(bool _cut_active)
|
||||
|
||||
if (files.count<=0) return; //no files
|
||||
|
||||
if (cut_active!=DELETE) cut_active = _cut_active;
|
||||
if (_cut_active!=DELETE) cut_active = _cut_active;
|
||||
|
||||
//if no element selected by "Insert" key, then we copy current element
|
||||
if (!selected_count) {
|
||||
|
@ -118,24 +118,26 @@ void ExitSettings()
|
||||
void DrawSettingsCheckBoxes()
|
||||
{
|
||||
incn y;
|
||||
int x=11, frx=26, but_x;
|
||||
int but_x;
|
||||
#define FRX 26
|
||||
#define XXX 11
|
||||
y.n = 0;
|
||||
show_dev_name.draw(x, y.inc(14));
|
||||
show_status_bar.draw(x, y.inc(25));
|
||||
show_breadcrumb.draw(x, y.inc(25));
|
||||
big_icons.draw(x, y.inc(25));
|
||||
colored_lines.draw(x, y.inc(25));
|
||||
font_size.draw(x, y.inc(31));
|
||||
line_height.draw(x, y.inc(31));
|
||||
show_dev_name.draw(XXX, y.inc(14));
|
||||
show_status_bar.draw(XXX, y.inc(25));
|
||||
show_breadcrumb.draw(XXX, y.inc(25));
|
||||
big_icons.draw(XXX, y.inc(25));
|
||||
colored_lines.draw(XXX, y.inc(25));
|
||||
font_size.draw(XXX, y.inc(31));
|
||||
line_height.draw(XXX, y.inc(31));
|
||||
|
||||
DrawFrame(x, y.inc(37), 340, 95, START_PATH);
|
||||
DrawFrame(XXX, y.inc(37), 340, 95, START_PATH);
|
||||
// START_PATH {
|
||||
DrawEditBoxPos(frx, y.inc(21), #path_start_ed);
|
||||
but_x = DrawStandartCaptButton(frx, y.inc(34), 6, SAVE_PATH_AS_DEFAULT);
|
||||
DrawStandartCaptButton(frx+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT);
|
||||
DrawEditBoxPos(FRX, y.inc(21), #path_start_ed);
|
||||
but_x = DrawStandartCaptButton(FRX, y.inc(34), 6, SAVE_PATH_AS_DEFAULT);
|
||||
DrawStandartCaptButton(FRX+but_x, y.inc(0), 7, SAVE_START_PATH_AS_DEFAULT);
|
||||
// } START_PATH
|
||||
|
||||
DrawStandartCaptButton(x, y.inc(52), 5, EDIT_FILE_ASSOCIATIONS);
|
||||
DrawStandartCaptButton(XXX, y.inc(52), 5, EDIT_FILE_ASSOCIATIONS);
|
||||
}
|
||||
|
||||
|
||||
|
@ -26,12 +26,8 @@
|
||||
|
||||
#include "../lib/patterns/rgb.h"
|
||||
|
||||
|
||||
#define DEFAULT_FONT "/sys/fonts/Tahoma.kf"
|
||||
|
||||
#ifndef KFONT_BPP
|
||||
#define KFONT_BPP 4
|
||||
#endif
|
||||
|
||||
int kfont_char_width[255];
|
||||
|
||||
@ -295,14 +291,12 @@ inline fastcall dword b32(EAX) { return DSDWORD[EAX]; }
|
||||
|
||||
:void KFONT::ShowBuffer(dword _x, _y)
|
||||
{
|
||||
if (4==KFONT_BPP) PutPaletteImage(raw, size.width, size.height, _x, _y, 32, 0);
|
||||
//if (1==KFONT_BPP) PutPaletteImage(raw, size.width, size.height, _x, _y, 8, #palette);
|
||||
PutPaletteImage(raw, size.width, size.height, _x, _y, 32, 0);
|
||||
}
|
||||
|
||||
:void KFONT::ShowBufferPart(dword _x, _y, _w, _h, _buf_offset)
|
||||
{
|
||||
if (4==KFONT_BPP) PutPaletteImage(_buf_offset * KFONT_BPP + raw, _w, _h, _x, _y, 32, 0);
|
||||
//if (1==KFONT_BPP) PutPaletteImage(_buf_offset * KFONT_BPP + raw, _w, _h, _x, _y, 8, #palette);
|
||||
PutPaletteImage(_buf_offset * KFONT_BPP + raw, _w, _h, _x, _y, 32, 0);
|
||||
}
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user