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

Adding a shortcut for saving snapshots and snapshot pane mod to be resizable (issues 1124, 1580)

Browse Source
This commit is contained in:
michael 2012-11-13 07:23:22 -05:00
parent a49d285ec9
commit e604e89273
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtdata/languages/default
View File

@ -418,6 +418,7 @@ HISTORY_MSG_191;CAM02 - Colorfullness (M)
HISTORY_MSG_192;CAM02 - Hue (angle) HISTORY_MSG_192;CAM02 - Hue (angle)
HISTORY_NEWSNAPSHOTAS;As... HISTORY_NEWSNAPSHOTAS;As...
HISTORY_NEWSNAPSHOT;Add HISTORY_NEWSNAPSHOT;Add
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
HISTORY_NEWSSDIALOGLABEL;Label of the snapshot: HISTORY_NEWSSDIALOGLABEL;Label of the snapshot:
HISTORY_NEWSSDIALOGTITLE;Add new snapshot HISTORY_NEWSSDIALOGTITLE;Add new snapshot
HISTORY_SETTO;Set to HISTORY_SETTO;Set to
@ -830,6 +831,7 @@ PROGRESSBAR_READY;Ready.
PROGRESSBAR_SAVEJPEG;Saving JPEG file... PROGRESSBAR_SAVEJPEG;Saving JPEG file...
PROGRESSBAR_SAVEPNG;Saving PNG file... PROGRESSBAR_SAVEPNG;Saving PNG file...
PROGRESSBAR_SAVETIFF;Saving TIFF file... PROGRESSBAR_SAVETIFF;Saving TIFF file...
PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added
PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser
QINFO_FOCALLENGTH;Focal length QINFO_FOCALLENGTH;Focal length
QINFO_ISO;ISO QINFO_ISO;ISO

9
rtgui/editorpanel.cc
View File

@ -936,6 +936,15 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
} }
} //if (!ctrl) } //if (!ctrl)
} //if (!alt) } //if (!alt)
if (alt){
switch (event->keyval) {
case GDK_s:
history->addBookmarkPressed ();
setProgressStr(M("PROGRESSBAR_SNAPSHOT_ADDED"));
return true;
}
}
if(tpc->getToolBar()->handleShortcutKey(event)) if(tpc->getToolBar()->handleShortcutKey(event))
return true; return true;

19
rtgui/history.cc
View File

@ -41,9 +41,7 @@ History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1)
Gtk::Frame* histFrame = Gtk::manage (new Gtk::Frame (M("HISTORY_LABEL"))); Gtk::Frame* histFrame = Gtk::manage (new Gtk::Frame (M("HISTORY_LABEL")));
histFrame->add (*hscrollw); histFrame->add (*hscrollw);
pack_start (*histFrame);
hTreeView = Gtk::manage (new Gtk::TreeView ()); hTreeView = Gtk::manage (new Gtk::TreeView ());
hscrollw->add (*hTreeView); hscrollw->add (*hTreeView);
@ -78,6 +76,7 @@ History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1)
Gtk::HBox* ahbox = Gtk::manage (new Gtk::HBox ()); Gtk::HBox* ahbox = Gtk::manage (new Gtk::HBox ());
addBookmark = Gtk::manage (new Gtk::Button (M("HISTORY_NEWSNAPSHOT"))); addBookmark = Gtk::manage (new Gtk::Button (M("HISTORY_NEWSNAPSHOT")));
addBookmark->set_tooltip_markup (M("HISTORY_NEWSNAPSHOT_TOOLTIP"));
Gtk::Image* addimg = Gtk::manage (new RTImage ("gtk-add.png")); Gtk::Image* addimg = Gtk::manage (new RTImage ("gtk-add.png"));
addBookmark->set_image (*addimg); addBookmark->set_image (*addimg);
ahbox->pack_start (*addBookmark); ahbox->pack_start (*addBookmark);
@ -95,11 +94,19 @@ History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1)
Gtk::Frame* bmFrame = Gtk::manage (new Gtk::Frame (M("HISTORY_SNAPSHOTS"))); Gtk::Frame* bmFrame = Gtk::manage (new Gtk::Frame (M("HISTORY_SNAPSHOTS")));
Gtk::VBox* bmBox = Gtk::manage (new Gtk::VBox ()); Gtk::VBox* bmBox = Gtk::manage (new Gtk::VBox ());
bmFrame->add (*bmBox); bmFrame->add (*bmBox);
bmBox->pack_start (*bscrollw, Gtk::PACK_SHRINK, 4); bmBox->pack_start (*bscrollw, Gtk::PACK_EXPAND_WIDGET, 4);
bmBox->pack_end (*ahbox, Gtk::PACK_SHRINK, 4); bmBox->pack_end (*ahbox, Gtk::PACK_SHRINK, 4);
if (bookmarkSupport) if (bookmarkSupport){
pack_end (*bmFrame, Gtk::PACK_SHRINK, 4); historyVPaned = Gtk::manage ( new Gtk::VPaned () );
historyVPaned->pack1 (*histFrame, true, true);
historyVPaned->pack2 (*bmFrame, false, true);
pack_start(*historyVPaned);
}
else{
pack_start (*histFrame);
}
bTreeView = Gtk::manage (new Gtk::TreeView ()); bTreeView = Gtk::manage (new Gtk::TreeView ());
bscrollw->add (*bTreeView); bscrollw->add (*bTreeView);

1
rtgui/history.h
View File

@ -56,6 +56,7 @@ class History : public Gtk::VBox, public PParamsChangeListener {
BookmarkColumns bookmarkColumns; BookmarkColumns bookmarkColumns;
protected: protected:
Gtk::VPaned* historyVPaned;
Gtk::ScrolledWindow* hscrollw; Gtk::ScrolledWindow* hscrollw;
Gtk::TreeView* hTreeView; Gtk::TreeView* hTreeView;
Glib::RefPtr<Gtk::ListStore> historyModel; Glib::RefPtr<Gtk::ListStore> historyModel;