mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Much improved list view for efiler - we should try to use the same API for icon view!

Browse Source
This commit is contained in:
Vedran Ljubovic 2006-08-21 19:27:22 +00:00
parent fac84c49a6
commit a030b9d7a6
3 changed files with 128 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
efiler/EDE_FileBrowser.cxx → efiler/EDE_FileBrowser.cpp
View File

@ -39,7 +39,8 @@
// Include necessary header files... // Include necessary header files...
// //
#include <fltk/FileBrowser.h> #include "EDE_FileBrowser.h"
#include <fltk/Browser.h> #include <fltk/Browser.h>
#include <fltk/Item.h> #include <fltk/Item.h>
#include <fltk/draw.h> #include <fltk/draw.h>
@ -77,12 +78,24 @@
# include <sys/mount.h> # include <sys/mount.h>
#endif // __APPLE__ && !__MWERKS__ #endif // __APPLE__ && !__MWERKS__
#include "../edelib2/Icon.h"
#include "../edelib2/Util.h"
#include "../edelib2/MimeType.h"
#define DEFAULT_ICON "misc-vedran"
#define FOLDER_ICON "folder"
#include <fltk/run.h>
using namespace fltk; using namespace fltk;
// //
// 'FileBrowser::FileBrowser()' - Create a FileBrowser widget. // 'FileBrowser::FileBrowser()' - Create a FileBrowser widget.
// //
const char *labels[] = {"Name","Type","Size","Date",0};
int widths[] = {200, 150, 100, 150, 0};
FileBrowser::FileBrowser(int X, // I - Upper-lefthand X coordinate FileBrowser::FileBrowser(int X, // I - Upper-lefthand X coordinate
int Y, // I - Upper-lefthand Y coordinate int Y, // I - Upper-lefthand Y coordinate
int W, // I - Width in pixels int W, // I - Width in pixels
@ -92,11 +105,17 @@ FileBrowser::FileBrowser(int X, // I - Upper-lefthand X coordinate
// Initialize the filter pattern, current directory, and icon size... // Initialize the filter pattern, current directory, and icon size...
pattern_ = "*"; pattern_ = "*";
directory_ = ""; directory_ = "";
icon_size_ = -1.0f; //icon_size_ = 12.0f;
filetype_ = FILES; //filetype_ = FILES;
show_hidden_ = false; show_hidden_ = false;
column_labels(labels);
column_widths(widths);
//Symbol* fileSmall = edelib::Icon::get(DEFAULT_ICON,edelib::Icon::SMALL);
//set_symbol(Browser::LEAF, fileSmall, fileSmall);
} }
// //
// 'FileBrowser::load()' - Load a directory into the browser. // 'FileBrowser::load()' - Load a directory into the browser.
// //
@ -127,132 +146,9 @@ FileBrowser::load(const char *directory,// I - Directory to load
// list all valid drive letters... // list all valid drive letters...
// //
num_files = 0; // TODO!
if ((icon = FileIcon::find("any", FileIcon::DEVICE)) == NULL) fprintf (stderr, "Drive list not implemented yet");
icon = FileIcon::find("any", FileIcon::DIRECTORY);
#ifdef WIN32
# ifdef __CYGWIN__
//
// Cygwin provides an implementation of setmntent() to get the list
// of available drives...
//
FILE *m = setmntent("/-not-used-", "r");
struct mntent *p;
while ((p = getmntent (m)) != NULL) {
add(p->mnt_dir, icon);
num_files ++;
}
endmntent(m);
# else
//
// Normal WIN32 code uses drive bits...
//
DWORD drives; // Drive available bits
drives = GetLogicalDrives();
for (i = 'A'; i <= 'Z'; i ++, drives >>= 1)
if (drives & 1)
{
sprintf(filename, "%c:/", i);
if (i < 'C')
add(filename, icon);
else
add(filename, icon);
num_files ++;
}
# endif // __CYGWIN__
#elif defined(__EMX__)
//
// OS/2 code uses drive bits...
//
ULONG curdrive; // Current drive
ULONG drives; // Drive available bits
int start = 3; // 'C' (MRS - dunno if this is correct!)
DosQueryCurrentDisk(&curdrive, &drives);
drives >>= start - 1;
for (i = 'A'; i <= 'Z'; i ++, drives >>= 1)
if (drives & 1)
{
sprintf(filename, "%c:/", i);
add(filename, icon);
num_files ++;
}
#elif defined(__APPLE__) && !defined(__MWERKS__)
// MacOS X and Darwin use getfsstat() system call...
int numfs; // Number of file systems
struct statfs *fs; // Buffer for file system info
// We always have the root filesystem.
add("/", icon);
// Get the mounted filesystems...
numfs = getfsstat(NULL, 0, MNT_NOWAIT);
if (numfs > 0) {
// We have file systems, get them...
fs = new struct statfs[numfs];
getfsstat(fs, sizeof(struct statfs) * numfs, MNT_NOWAIT);
// Add filesystems to the list...
for (i = 0; i < numfs; i ++) {
// Ignore "/", "/dev", and "/.vol"...
if (fs[i].f_mntonname[1] && strcmp(fs[i].f_mntonname, "/dev") &&
strcmp(fs[i].f_mntonname, "/.vol")) {
snprintf(filename, sizeof(filename), "%s/", fs[i].f_mntonname);
add(filename, icon);
}
num_files ++;
}
// Free the memory used for the file system info array...
delete[] fs;
}
#else
//
// UNIX code uses /etc/fstab or similar...
//
FILE *mtab; // /etc/mtab or /etc/mnttab file
char line[1024]; // Input line
//
// Open the file that contains a list of mounted filesystems...
//
mtab = fopen("/etc/mnttab", "r"); // Fairly standard
if (mtab == NULL)
mtab = fopen("/etc/mtab", "r"); // More standard
if (mtab == NULL)
mtab = fopen("/etc/fstab", "r"); // Otherwise fallback to full list
if (mtab == NULL)
mtab = fopen("/etc/vfstab", "r"); // Alternate full list file
if (mtab != NULL)
{
while (fgets(line, sizeof(line), mtab) != NULL)
{
if (line[0] == '#' || line[0] == '\n')
continue;
if (sscanf(line, "%*s%4095s", filename) != 1)
continue;
strlcat(filename, "/", sizeof(filename));
// printf("FileBrowser::load() - adding \"%s\" to list...\n", filename);
add(filename, icon);
num_files ++;
}
fclose(mtab);
}
#endif // WIN32 || __EMX__
} }
else else
{ {
@ -263,50 +159,78 @@ FileBrowser::load(const char *directory,// I - Directory to load
// Build the file list... // Build the file list...
// //
#if (defined(WIN32) && !defined(__CYGWIN__)) || defined(__EMX__)
strlcpy(filename, directory_, sizeof(filename));
i = strlen(filename) - 1;
if (i == 2 && filename[1] == ':' &&
(filename[2] == '/' || filename[2] == '\\'))
filename[2] = '/';
else if (filename[i] != '/' && filename[i] != '\\')
strlcat(filename, "/", sizeof(filename));
num_files = fltk::filename_list(filename, &files, sort);
#else
num_files = fltk::filename_list(directory_, &files, sort); num_files = fltk::filename_list(directory_, &files, sort);
#endif /* WIN32 || __EMX__ */
if (num_files <= 0) if (num_files <= 0)
return (0); return (0);
Item** icon_array = (Item**) malloc (sizeof(Item*) * num_files + 1);
// fill array with zeros, for easier detection if item exists
for (i=0; i<num_files; i++) icon_array[i]=0;
for (i = 0, num_dirs = 0; i < num_files; i ++) { for (i = 0, num_dirs = 0; i < num_files; i ++) {
if (strcmp(files[i]->d_name, "./") ) { if (strcmp(files[i]->d_name, "./") ) {
snprintf(filename, sizeof(filename), "%s/%s", directory_, snprintf(filename, sizeof(filename), "%s%s", directory_,
files[i]->d_name); files[i]->d_name);
//bool ft = true; if (ft) {FileIcon::load_system_icons(); ft=false;} //bool ft = true; if (ft) {FileIcon::load_system_icons(); ft=false;}
icon = FileIcon::find(filename); //icon = FileIcon::find(filename);
//printf("%s\n",files[i]->d_name); //printf("%s\n",files[i]->d_name);
if (!strcmp(files[i]->d_name, ".") || !strcmp(files[i]->d_name, "./") || if (!strcmp(files[i]->d_name, ".") || !strcmp(files[i]->d_name, "./") ||
!show_hidden_ && files[i]->d_name[0]=='.' && strncmp(files[i]->d_name,"../",2)) !show_hidden_ && files[i]->d_name[0]=='.' && strncmp(files[i]->d_name,"../",2))
continue; continue;
if ((icon && icon->type() == FileIcon::DIRECTORY) ||
fltk::filename_isdir(filename)) { if (fltk::filename_isdir(filename)) {
num_dirs ++; num_dirs ++;
this->insert(num_dirs-1, files[i]->d_name, icon); Item* o = new Item(edelib::Icon::get(FOLDER_ICON,edelib::Icon::TINY), strdup(files[i]->d_name));
Menu::insert(*o, num_dirs-1);
o->user_data(strdup(filename)); // we keep full path for callback
icon_array[i]=o;
} else if (filetype_ == FILES && } else if (filetype_ == FILES &&
fltk::filename_match(files[i]->d_name, pattern_)) { fltk::filename_match(files[i]->d_name, pattern_)) {
add(files[i]->d_name, icon); this->begin();
Item* o = new Item(edelib::Icon::get(DEFAULT_ICON,edelib::Icon::TINY), strdup(files[i]->d_name));
this->end();
o->user_data(strdup(filename)); // we keep full path for callback
icon_array[i]=o;
} }
} }
}
this->redraw();
// Detect icon mimetypes etc.
for (i=0; i<num_files; i++) {
// ignored files
if (!icon_array[i]) continue;
fltk::check(); // update interface
// get mime data
snprintf (filename,4095,"%s%s",directory_,files[i]->d_name);
edelib::MimeType *m = new edelib::MimeType(filename);
// change label
char *label;
if (strncmp(m->id(),"directory",9)==0)
asprintf(&label, "%s\t%s\t\t%s", files[i]->d_name, m->type_string(), edelib::nice_time(filename_mtime(filename)));
else
asprintf(&label, "%s\t%s\t%s\t%s", files[i]->d_name, m->type_string(), edelib::nice_size(filename_size(filename)), edelib::nice_time(filename_mtime(filename)));
icon_array[i]->label(label);
// icon
icon_array[i]->image(m->icon(edelib::Icon::TINY));
icon_array[i]->redraw();
delete m;
free(files[i]); free(files[i]);
} }
free(files); free(files);
} }
return (num_files); return (num_files);
@ -336,7 +260,7 @@ private:
FileItem::FileItem(const char * label, FileIcon * icon) : Item(label) { FileItem::FileItem(const char * label, FileIcon * icon) : Item(label) {
fileIcon_=icon; fileIcon_=icon;
textsize(14); // textsize(14);
if(icon) icon->value(this,true); if(icon) icon->value(this,true);
} }
void FileItem::draw() { void FileItem::draw() {
@ -345,7 +269,7 @@ void FileItem::draw() {
} }
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
void FileBrowser::add(const char *line, FileIcon *icon) { /*void FileBrowser::add(const char *line, FileIcon *icon) {
this->begin(); this->begin();
FileItem * i = new FileItem(strdup(line),icon); FileItem * i = new FileItem(strdup(line),icon);
i->w((int) icon_size()); i->h(i->w()); i->w((int) icon_size()); i->h(i->w());
@ -357,7 +281,7 @@ void FileBrowser::insert(int n, const char *label, FileIcon*icon) {
FileItem * i = new FileItem(strdup(label),icon); FileItem * i = new FileItem(strdup(label),icon);
i->w((int) icon_size()); i->h(i->w()); i->w((int) icon_size()); i->h(i->w());
Menu::insert(*i,n); Menu::insert(*i,n);
} }*/
// //
// End of "$Id: FileBrowser.cxx 5071 2006-05-02 21:57:08Z fabien $". // End of "$Id: FileBrowser.cxx 5071 2006-05-02 21:57:08Z fabien $".

32
efiler/EDE_FileBrowser.h
View File

@ -29,53 +29,57 @@
// Include necessary header files... // Include necessary header files...
// //
#ifndef fltk_FileBrowser_h #ifndef edelib_FileBrowser_h
#define fltk_FileBrowser_h #define edelib_FileBrowser_h
#include <fltk/Browser.h> #include <fltk/Browser.h>
#include <fltk/FileIcon.h> #include <fltk/FileIcon.h>
#include <fltk/filename.h> #include <fltk/filename.h>
namespace fltk { //namespace fltk {
// //
// FileBrowser class... // FileBrowser class...
// //
class FL_API FileBrowser : public Browser class FileBrowser : public fltk::Browser
{ {
int filetype_; int filetype_;
const char *directory_; const char *directory_;
float icon_size_; //float icon_size_;
const char *pattern_; const char *pattern_;
public: public:
enum { FILES, DIRECTORIES }; enum { FILES, DIRECTORIES };
FileBrowser(int, int, int, int, const char * = 0); FileBrowser(int, int, int, int, const char * = 0);
float icon_size() const { /*float icon_size() const {
return (icon_size_ <0? (2.0f* textsize()) : icon_size_); return (icon_size_ <0? (2.0f* textsize()) : icon_size_);
} }
void icon_size(float f) { icon_size_ = f; redraw(); }; void icon_size(float f) { icon_size_ = f; redraw(); };*/
void filter(const char *pattern); void filter(const char *pattern);
const char *filter() const { return (pattern_); }; const char *filter() const { return (pattern_); };
int load(const char *directory, File_Sort_F *sort = (File_Sort_F*) fltk::numericsort); int load(const char *directory, fltk::File_Sort_F *sort = (fltk::File_Sort_F*) fltk::casenumericsort);
float textsize() const { return (Browser::textsize()); }; /* float textsize() const { return (fltk::Browser::textsize()); };
void textsize(float s) { Browser::textsize(s); icon_size_ = (uchar)(3 * s / 2); }; void textsize(float s) { fltk::Browser::textsize(s); icon_size_ = (uchar)(3 * s / 2); };*/
int filetype() const { return (filetype_); }; int filetype() const { return (filetype_); };
void filetype(int t) { filetype_ = t; }; void filetype(int t) { filetype_ = t; };
const char * directory() const {return directory_;} const char * directory() const {return directory_;}
// adding or inserting a line into the fileBrowser // adding or inserting a line into the fileBrowser
void insert(int n, const char* label, FileIcon* icon); //void insert(int n, const char* label, fltk::FileIcon* icon);
void insert(int n, const char* label, void* data){Menu::insert(n, label,data);} //void insert(int n, const char* label, void* data){fltk::Menu::insert(n, label,data);}
void add(const char * line, FileIcon* icon); //void add(const char * line, fltk::FileIcon* icon);
// Return full system path to given item
const char* system_path(int i) const { return (const char*)child(i)->user_data(); }
// Showing or not showing the hidden files, that's the question: // Showing or not showing the hidden files, that's the question:
public: public:
@ -86,7 +90,7 @@ private:
bool show_hidden_; bool show_hidden_;
}; };
} //}
#endif // !_Fl_File_Browser_H_ #endif // !_Fl_File_Browser_H_

41
efiler/efiler.cpp
View File

@ -22,7 +22,7 @@
#include <fltk/Item.h> #include <fltk/Item.h>
#include <fltk/Divider.h> #include <fltk/Divider.h>
#include <fltk/file_chooser.h> #include <fltk/file_chooser.h>
#include <fltk/FileBrowser.h> //#include <fltk/FileBrowser.h>
#include "../edelib2/about_dialog.h" #include "../edelib2/about_dialog.h"
#include "../edelib2/Icon.h" #include "../edelib2/Icon.h"
@ -31,6 +31,8 @@
#include "../edelib2/Run.h" #include "../edelib2/Run.h"
#include "../edelib2/Util.h" #include "../edelib2/Util.h"
#include "EDE_FileBrowser.h"
#define DEFAULT_ICON "misc-vedran" #define DEFAULT_ICON "misc-vedran"
@ -97,7 +99,7 @@ void loaddir(const char *path) {
// Set current_dir // Set current_dir
if (filename_isdir(path)) { if (filename_isdir(path)) {
if (path[0] == '~') // Expand tilde if (path[0] == '~') // Expand tilde
snprintf(current_dir,PATH_MAX,"%s/%s",getenv("HOME"),path); snprintf(current_dir,PATH_MAX,"%s/%s",getenv("HOME"),path+1);
else else
strcpy(current_dir,path); strcpy(current_dir,path);
} else } else
@ -247,16 +249,17 @@ void fbrowser_cb(Widget* w, void*) {
if (!event_clicks() && event_key() != ReturnKey) return; if (!event_clicks() && event_key() != ReturnKey) return;
// Construct filename // Construct filename
const char *c = fbrowser->child(fbrowser->value())->label(); const char *c = fbrowser->system_path(fbrowser->value());
char filename[PATH_MAX]; char filename[PATH_MAX];
if (strcmp(c,"../")==0) { if (strncmp(c+strlen(c)-3,"../",3)==0) {
strcpy(filename,current_dir); // both are [PATH_MAX] strcpy(filename,current_dir); // both are [PATH_MAX]
filename[strlen(filename)-1] = '\0'; // remove trailing slash in a directory filename[strlen(filename)-1] = '\0'; // remove trailing slash in a directory
char *c2 = strrchr(filename,'/'); // find previous slash char *c2 = strrchr(filename,'/'); // find previous slash
if (c2) *(c2+1) = '\0'; // cut everything after this slash if (c2) *(c2+1) = '\0'; // cut everything after this slash
else strcpy(filename,"/"); // if nothing is found, filename becomes "/" else strcpy(filename,"/"); // if nothing is found, filename becomes "/"
} else } else {
snprintf(filename,PATH_MAX,"%s%s",current_dir,c); strncpy(filename,c,PATH_MAX);
}
// Change directory // Change directory
if (filename_isdir(filename)) if (filename_isdir(filename))
@ -264,7 +267,7 @@ void fbrowser_cb(Widget* w, void*) {
// Let elauncher handle this file... // Let elauncher handle this file...
else else
run_program(filename,false,false,true); run_program(tsprintf("file:%s",filename),false,false,true);
} }
@ -314,7 +317,7 @@ void do_cut_copy_fbrowser(bool m_copy) {
int buf=0; int buf=0;
for (int i=0; i<=num; i++) { for (int i=0; i<=num; i++) {
if (fbrowser->selected(i)) { if (fbrowser->selected(i)) {
asprintf(&cut_copy_buffer[buf], "%s%s", current_dir, fbrowser->child(i)->label()); cut_copy_buffer[buf] = strdup(fbrowser->system_path(i));
if (!m_copy) fbrowser->child(i)->textcolor(GRAY50); if (!m_copy) fbrowser->child(i)->textcolor(GRAY50);
buf++; buf++;
} }
@ -386,6 +389,13 @@ void iconsview_cb(Widget*,void*) {
} }
} }
void listview_cb(Widget*,void*) { sgroup->hide(); fbrowser->show(); } void listview_cb(Widget*,void*) { sgroup->hide(); fbrowser->show(); }
void refresh_cb(Widget*,void*) {
if(sgroup->visible()) loaddir(current_dir);
else fbrowser->load(current_dir);
}
void case_cb(Widget*,void*) {
fprintf(stderr,"Not implemented yet...\n");
}
void showhidden_cb(Widget* w, void*) { void showhidden_cb(Widget* w, void*) {
Item *i = (Item*)w; Item *i = (Item*)w;
if (showhidden) { if (showhidden) {
@ -487,6 +497,21 @@ int main (int argc, char **argv) {
o->type(Item::TOGGLE); o->type(Item::TOGGLE);
o->shortcut(F9Key); o->shortcut(F9Key);
} }
new Divider();
{Item *o = new Item(_("&Refresh"));
//o->type();
o->callback(refresh_cb);
o->shortcut(F5Key);
}
{ItemGroup *o = new ItemGroup(_("S&ort"));
o->begin();
{Item *o = new Item(_("&Case sensitive"));
//o->type();
o->callback(case_cb);
o->shortcut(F5Key);
}
o->end();
}
o->end(); o->end();
} }
{ItemGroup *o = new ItemGroup(_("&Help")); {ItemGroup *o = new ItemGroup(_("&Help"));