diff --git a/rtdata/images/themed/png/dark/trash-delete.png b/rtdata/images/themed/png/dark/trash-delete.png
new file mode 100644
index 000000000..1a7c084aa
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-delete.png differ
diff --git a/rtdata/images/themed/png/dark/trash-empty-show.png b/rtdata/images/themed/png/dark/trash-empty-show.png
new file mode 100644
index 000000000..983979634
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-empty-show.png differ
diff --git a/rtdata/images/themed/png/dark/trash.png b/rtdata/images/themed/png/dark/trash-empty.png
similarity index 100%
rename from rtdata/images/themed/png/dark/trash.png
rename to rtdata/images/themed/png/dark/trash-empty.png
diff --git a/rtdata/images/themed/png/dark/trash-full-show.png b/rtdata/images/themed/png/dark/trash-full-show.png
new file mode 100644
index 000000000..1c1c7aa17
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-full-show.png differ
diff --git a/rtdata/images/themed/png/dark/trash-full.png b/rtdata/images/themed/png/dark/trash-full.png
new file mode 100644
index 000000000..699d2b8ac
Binary files /dev/null and b/rtdata/images/themed/png/dark/trash-full.png differ
diff --git a/rtdata/images/themed/png/dark/trash-hide-deleted.png b/rtdata/images/themed/png/dark/trash-hide-deleted.png
index 94c1b6722..ffbb9f391 100644
Binary files a/rtdata/images/themed/png/dark/trash-hide-deleted.png and b/rtdata/images/themed/png/dark/trash-hide-deleted.png differ
diff --git a/rtdata/images/themed/png/light/trash-delete.png b/rtdata/images/themed/png/light/trash-delete.png
new file mode 100644
index 000000000..7d0c422f7
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-delete.png differ
diff --git a/rtdata/images/themed/png/light/trash-empty-show.png b/rtdata/images/themed/png/light/trash-empty-show.png
new file mode 100644
index 000000000..9e4ade318
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-empty-show.png differ
diff --git a/rtdata/images/themed/png/light/trash.png b/rtdata/images/themed/png/light/trash-empty.png
similarity index 100%
rename from rtdata/images/themed/png/light/trash.png
rename to rtdata/images/themed/png/light/trash-empty.png
diff --git a/rtdata/images/themed/png/light/trash-full-show.png b/rtdata/images/themed/png/light/trash-full-show.png
new file mode 100644
index 000000000..8061c5070
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-full-show.png differ
diff --git a/rtdata/images/themed/png/light/trash-full.png b/rtdata/images/themed/png/light/trash-full.png
new file mode 100644
index 000000000..a43d6f3e5
Binary files /dev/null and b/rtdata/images/themed/png/light/trash-full.png differ
diff --git a/rtdata/images/themed/png/light/trash-hide-deleted.png b/rtdata/images/themed/png/light/trash-hide-deleted.png
index 2d26d230a..319a0dd4a 100644
Binary files a/rtdata/images/themed/png/light/trash-hide-deleted.png and b/rtdata/images/themed/png/light/trash-hide-deleted.png differ
diff --git a/rtdata/images/themed/svg/trash-delete.svg b/rtdata/images/themed/svg/trash-delete.svg
new file mode 100644
index 000000000..7593e6001
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-delete.svg
@@ -0,0 +1,368 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-show.svg b/rtdata/images/themed/svg/trash-empty-show.svg
similarity index 100%
rename from rtdata/images/themed/svg/trash-show.svg
rename to rtdata/images/themed/svg/trash-empty-show.svg
diff --git a/rtdata/images/themed/svg/trash.svg b/rtdata/images/themed/svg/trash-empty.svg
similarity index 99%
rename from rtdata/images/themed/svg/trash.svg
rename to rtdata/images/themed/svg/trash-empty.svg
index b86856309..47ceae609 100644
--- a/rtdata/images/themed/svg/trash.svg
+++ b/rtdata/images/themed/svg/trash-empty.svg
@@ -18,7 +18,7 @@
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.2 2405546, 2018-03-11"
- sodipodi:docname="trash.svg">
+ sodipodi:docname="trash-empty.svg">
+
+
+
diff --git a/rtdata/images/themed/svg/trash-full.svg b/rtdata/images/themed/svg/trash-full.svg
new file mode 100644
index 000000000..eae5920e3
--- /dev/null
+++ b/rtdata/images/themed/svg/trash-full.svg
@@ -0,0 +1,290 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/trash-hide-deleted.svg b/rtdata/images/themed/svg/trash-hide-deleted.svg
index 64d4d5915..e70aa21e1 100644
--- a/rtdata/images/themed/svg/trash-hide-deleted.svg
+++ b/rtdata/images/themed/svg/trash-hide-deleted.svg
@@ -27,11 +27,11 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="34.25"
- inkscape:cx="7.7372263"
+ inkscape:cx="12"
inkscape:cy="12"
inkscape:document-units="px"
inkscape:current-layer="layer1"
- showgrid="false"
+ showgrid="true"
inkscape:window-width="1920"
inkscape:window-height="1019"
inkscape:window-x="0"
@@ -253,16 +253,6 @@
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
-
-
+
+
+
+
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 8b552a51f..a7ac089a3 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -74,7 +74,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
trashButtonBox = Gtk::manage( new Gtk::VBox );
Gtk::Button* emptyT = Gtk::manage( new Gtk::Button ());
emptyT->set_tooltip_markup (M("FILEBROWSER_EMPTYTRASHHINT"));
- emptyT->set_image (*Gtk::manage(new RTImage ("trash.png")));
+ emptyT->set_image (*Gtk::manage(new RTImage ("trash-delete.png")));
emptyT->signal_pressed().connect (sigc::mem_fun(*this, &FileCatalog::emptyTrash));
trashButtonBox->pack_start (*emptyT, Gtk::PACK_SHRINK, 4);
emptyT->show ();
@@ -294,11 +294,11 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
// Trash
- iTrashEmpty = new RTImage("trash.png") ;
- iTrashFull = new RTImage("trash-show.png") ;
+ iTrashShowEmpty = new RTImage("trash-empty-show.png") ;
+ iTrashShowFull = new RTImage("trash-full-show.png") ;
bTrash = Gtk::manage( new Gtk::ToggleButton () );
- bTrash->set_image (*iTrashEmpty);
+ bTrash->set_image (*iTrashShowEmpty);
bTrash->set_relief (Gtk::RELIEF_NONE);
bTrash->set_tooltip_markup (M("FILEBROWSER_SHOWTRASHHINT"));
bCateg[17] = bTrash->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bTrash, true));
@@ -471,8 +471,8 @@ FileCatalog::~FileCatalog()
delete igUnRanked;
delete iUnCLabeled;
delete igUnCLabeled;
- delete iTrashEmpty;
- delete iTrashFull;
+ delete iTrashShowEmpty;
+ delete iTrashShowFull;
delete iNotTrash;
delete iOriginal;
delete iRefreshWhite;
@@ -1975,9 +1975,9 @@ void FileCatalog::setFilterPanel (FilterPanel* fpanel)
void FileCatalog::trashChanged ()
{
if (trashIsEmpty()) {
- bTrash->set_image(*iTrashEmpty);
+ bTrash->set_image(*iTrashShowEmpty);
} else {
- bTrash->set_image(*iTrashFull);
+ bTrash->set_image(*iTrashShowFull);
}
}
diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h
index 29e4a370a..66f14b6b2 100644
--- a/rtgui/filecatalog.h
+++ b/rtgui/filecatalog.h
@@ -104,7 +104,7 @@ private:
Gtk::Image* iCLabeled[5], *igCLabeled[5], *iUnCLabeled, *igUnCLabeled;
Gtk::Image* iEdited[2], *igEdited[2];
Gtk::Image* iRecentlySaved[2], *igRecentlySaved[2];
- Gtk::Image *iTrashEmpty, *iTrashFull;
+ Gtk::Image *iTrashShowEmpty, *iTrashShowFull;
Gtk::Image *iNotTrash, *iOriginal;
Gtk::Image *iRefreshWhite, *iRefreshRed;
Gtk::Image *iLeftPanel_1_Show, *iLeftPanel_1_Hide, *iRightPanel_1_Show, *iRightPanel_1_Hide;