liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added usability patch for trash icon

Browse Source
This commit is contained in:
Wyatt Olson 2010-04-24 12:31:46 -06:00
parent 7b0290328b
commit 84dfc93d91
5 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
rtdata/images/trash-show-full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 927 B

9
rtgui/filebrowser.cc
View File

@ -446,7 +446,8 @@ void FileBrowser::toTrashRequested (std::vector<FileBrowserEntry*> tbe) {
tbe[i]->getThumbButtonSet()->setRank (tbe[i]->thumbnail->getRank());
tbe[i]->getThumbButtonSet()->setInTrash (true);
}
}
}
trash_changed().emit();
applyFilter (filter);
}
@ -460,7 +461,8 @@ void FileBrowser::fromTrashRequested (std::vector<FileBrowserEntry*> tbe) {
tbe[i]->getThumbButtonSet()->setRank (tbe[i]->thumbnail->getRank());
tbe[i]->getThumbButtonSet()->setInTrash (false);
}
}
}
trash_changed().emit();
applyFilter (filter);
}
@ -579,3 +581,6 @@ void FileBrowser::redrawNeeded (LWButton* button) {
queue_draw ();
}
FileBrowser::type_trash_changed FileBrowser::trash_changed () {
return m_trash_changed;
}

8
rtgui/filebrowser.h
View File

@ -45,6 +45,8 @@ struct FileBrowserIdleHelper {
};
class FileBrowser : public ThumbBrowserBase, public LWButtonListener {
typedef sigc::signal<void> type_trash_changed;
protected:
@ -75,6 +77,8 @@ class FileBrowser : public ThumbBrowserBase, public LWButtonListener {
void fromTrashRequested (std::vector<FileBrowserEntry*> tbe);
void rankingRequested (std::vector<FileBrowserEntry*> tbe, int rank);
void notifySelectionListener ();
type_trash_changed m_trash_changed;
public:
@ -110,7 +114,9 @@ class FileBrowser : public ThumbBrowserBase, public LWButtonListener {
void thumbRearrangementNeeded ();
void _thumbRearrangementNeeded ();
void selectionChanged ();
void selectionChanged ();
type_trash_changed trash_changed();
};
#endif

26
rtgui/filecatalog.cc
View File

@ -104,14 +104,18 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb) : listener(NULL), fslist
bRank[3]->set_tooltip_text (M("FILEBROWSER_SHOWRANK4HINT"));
bRank[4]->set_tooltip_text (M("FILEBROWSER_SHOWRANK5HINT"));
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
iTrashEmpty = new Gtk::Image(argv0+"/images/trash-show-empty.png");
iTrashFull = new Gtk::Image(argv0+"/images/trash-show-full.png");
bTrash = new Gtk::ToggleButton ();
bTrash->set_image (*(new Gtk::Image (Gtk::StockID("gtk-delete"), Gtk::ICON_SIZE_SMALL_TOOLBAR)));
bTrash->set_image (*iTrashEmpty);
bTrash->set_relief (Gtk::RELIEF_NONE);
bTrash->set_tooltip_text (M("FILEBROWSER_SHOWTRASHHINT"));
bCateg[7] = bTrash->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bTrash));
buttonBar->pack_start (*bTrash, Gtk::PACK_SHRINK);
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
buttonBar->pack_start (*(new Gtk::VSeparator), Gtk::PACK_SHRINK);
fileBrowser->trash_changed().connect( sigc::mem_fun(*this, &FileCatalog::trashChanged) );
categoryButtons[0] = bDir;
categoryButtons[1] = bUnRanked;
@ -746,7 +750,17 @@ void FileCatalog::emptyTrash () {
if (((FileBrowserEntry*)t[i])->thumbnail->getStage()==1)
toDel.push_back (((FileBrowserEntry*)t[i]));
deleteRequested (toDel);
trashChanged();
}
bool FileCatalog::trashIsEmpty () {
const std::vector<ThumbBrowserEntryBase*> t = fileBrowser->getEntries ();
for (int i=0; i<t.size(); i++)
if (((FileBrowserEntry*)t[i])->thumbnail->getStage()==1)
return false;
return true;
}
void FileCatalog::zoomIn () {
@ -795,3 +809,11 @@ void FileCatalog::setFilterPanel (FilterPanel* fpanel) {
filterPanel->set_sensitive (false);
filterPanel->setFilterPanelListener (this);
}
void FileCatalog::trashChanged () {
if (trashIsEmpty()) {
bTrash->set_image(*iTrashEmpty);
}
else {
bTrash->set_image(*iTrashFull);
}
}

9
rtgui/filecatalog.h
View File

@ -98,7 +98,8 @@ class FileCatalog : public Gtk::VBox,
Gtk::ToggleButton* categoryButtons[8];
Gtk::ToggleButton* exifInfo;
sigc::connection bCateg[8];
Gtk::Image* iranked[5], *igranked[5];
Gtk::Image* iranked[5], *igranked[5];
Gtk::Image *iTrashEmpty, *iTrashFull;
double hScrollPos[8];
double vScrollPos[8];
@ -135,7 +136,8 @@ class FileCatalog : public Gtk::VBox,
void addAndOpenFile (const Glib::ustring& fname);
void checkAndAddFile (Glib::RefPtr<Gio::File> info);
std::vector<Glib::ustring> getFileList ();
BrowserFilter getFilter ();
BrowserFilter getFilter ();
void trashChanged ();
public:
CoarsePanel* coarsePanel;
@ -166,7 +168,8 @@ class FileCatalog : public Gtk::VBox,
void developRequested (std::vector<FileBrowserEntry*> tbe);
void renameRequested (std::vector<FileBrowserEntry*> tbe);
void selectionChanged (std::vector<Thumbnail*> tbe);
void emptyTrash ();
void emptyTrash ();
bool trashIsEmpty ();
void setFileSelectionListener (FileSelectionListener* l) { listener = l; }
void setFileSelectionChangeListener (FileSelectionChangeListener* l) { fslistener = l; }