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

Use the provided images for the filter-original button and the parsed extensions list and extend the filer-original tool tip.

Browse Source
This commit is contained in:
Adam Reichold
2015-12-17 20:01:40 +01:00
parent 97814fbf6e
commit 1b4fd2dcb5
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/default
View File

@@ -171,7 +171,7 @@ FILEBROWSER_SHOWEDITEDHINT;Show edited images.\nShortcut: <b>7</b>
FILEBROWSER_SHOWEDITEDNOTHINT;Show not edited images.\nShortcut: <b>6</b>
FILEBROWSER_SHOWEXIFINFO;Show Exif info.\n\nShortcuts:\n<b>i</b> - Multiple Editor Tabs Mode,\n<b>Alt-i</b> - Single Editor Tab Mode.
FILEBROWSER_SHOWNOTTRASHHINT;Show only non-deleted images.
FILEBROWSER_SHOWORIGINALHINT;Show only the original images.
FILEBROWSER_SHOWORIGINALHINT;Show only the original images.\n\nThe orignal images are determined by the position of their file extensions in the parsed extensions list in the preferences. Extensions higher up in that list are considered the originals of those below.
FILEBROWSER_SHOWRANK1HINT;Show images ranked as 1-star.\nShortcut: <b>1</b>
FILEBROWSER_SHOWRANK2HINT;Show images ranked as 2-star.\nShortcut: <b>2</b>
FILEBROWSER_SHOWRANK3HINT;Show images ranked as 3-star.\nShortcut: <b>3</b>

5
rtgui/filecatalog.cc
View File

@@ -286,6 +286,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
bTrash->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false);
iNotTrash = new RTImage("trash-hide-deleted.png") ;
iOriginal = new RTImage("filter-original-2.png");
bNotTrash = Gtk::manage( new Gtk::ToggleButton () );
bNotTrash->set_image (*iNotTrash);
@@ -295,7 +296,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
bNotTrash->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false);
bOriginal = Gtk::manage( new Gtk::ToggleButton () );
bOriginal->set_label ("O"); // TODO: Add icon...
bOriginal->set_image (*iOriginal);
bOriginal->set_tooltip_markup (M("FILEBROWSER_SHOWORIGINALHINT"));
bOriginal->set_relief (Gtk::RELIEF_NONE);
bCateg[19] = bOriginal->signal_toggled().connect (sigc::bind(sigc::mem_fun(*this, &FileCatalog::categoryButtonToggled), bOriginal, true));
@@ -450,6 +451,8 @@ FileCatalog::~FileCatalog()
delete igUnCLabeled;
delete iTrashEmpty;
delete iTrashFull;
delete iNotTrash;
delete iOriginal;
delete iRefreshWhite;
delete iRefreshRed;
delete iQueryClear;

2
rtgui/filecatalog.h
View File

@@ -118,7 +118,7 @@ private:
Gtk::Image* iEdited[2], *igEdited[2];
Gtk::Image* iRecentlySaved[2], *igRecentlySaved[2];
Gtk::Image *iTrashEmpty, *iTrashFull;
Gtk::Image *iNotTrash;
Gtk::Image *iNotTrash, *iOriginal;
Gtk::Image *iRefreshWhite, *iRefreshRed;
Gtk::Image *iLeftPanel_1_Show, *iLeftPanel_1_Hide, *iRightPanel_1_Show, *iRightPanel_1_Hide;
Gtk::Image *iQueryClear;

6
rtgui/preferences.cc
View File

@@ -1196,10 +1196,12 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
moveExtDown->set_tooltip_text (M("PREFERENCES_PARSEDEXTDOWNHINT"));
Gtk::Image* addExtImg = Gtk::manage( new RTImage ("list-add-small.png") );
Gtk::Image* delExtImg = Gtk::manage( new RTImage ("list-remove-red-small.png") );
Gtk::Image* moveExtUpImg = Gtk::manage( new RTImage ("arrow-up-small.png") );
Gtk::Image* moveExtDownImg = Gtk::manage( new RTImage ("arrow-down-small.png") );
addExt->add (*addExtImg);
delExt->add (*delExtImg);
moveExtUp->set_label ("↑"); // TODO: Add arrow up image...
moveExtDown->set_label ("↓"); // TODO: Add arrow down image...
moveExtUp->set_image (*moveExtUpImg);
moveExtDown->set_image (*moveExtDownImg);
hb0->pack_end (*moveExtDown, Gtk::PACK_SHRINK, 4);
hb0->pack_end (*moveExtUp, Gtk::PACK_SHRINK, 4);
hb0->pack_end (*delExt, Gtk::PACK_SHRINK, 4);