Adding a shortcut for saving snapshots and snapshot pane mod to be resizable (issues 1124, 1580)
This commit is contained in:
parent
a49d285ec9
commit
e604e89273
@ -418,6 +418,7 @@ HISTORY_MSG_191;CAM02 - Colorfullness (M)
|
||||
HISTORY_MSG_192;CAM02 - Hue (angle)
|
||||
HISTORY_NEWSNAPSHOTAS;As...
|
||||
HISTORY_NEWSNAPSHOT;Add
|
||||
HISTORY_NEWSNAPSHOT_TOOLTIP;Shortcut: <b>Alt-s</b>
|
||||
HISTORY_NEWSSDIALOGLABEL;Label of the snapshot:
|
||||
HISTORY_NEWSSDIALOGTITLE;Add new snapshot
|
||||
HISTORY_SETTO;Set to
|
||||
@ -830,6 +831,7 @@ PROGRESSBAR_READY;Ready.
|
||||
PROGRESSBAR_SAVEJPEG;Saving JPEG file...
|
||||
PROGRESSBAR_SAVEPNG;Saving PNG file...
|
||||
PROGRESSBAR_SAVETIFF;Saving TIFF file...
|
||||
PROGRESSBAR_SNAPSHOT_ADDED;Snapshot added
|
||||
PROGRESSDLG_PROFILECHANGEDINBROWSER;Processing profile changed in browser
|
||||
QINFO_FOCALLENGTH;Focal length
|
||||
QINFO_ISO;ISO
|
||||
|
@ -936,6 +936,15 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event) {
|
||||
}
|
||||
} //if (!ctrl)
|
||||
} //if (!alt)
|
||||
|
||||
if (alt){
|
||||
switch (event->keyval) {
|
||||
case GDK_s:
|
||||
history->addBookmarkPressed ();
|
||||
setProgressStr(M("PROGRESSBAR_SNAPSHOT_ADDED"));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if(tpc->getToolBar()->handleShortcutKey(event))
|
||||
return true;
|
||||
|
@ -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")));
|
||||
histFrame->add (*hscrollw);
|
||||
|
||||
pack_start (*histFrame);
|
||||
|
||||
|
||||
hTreeView = Gtk::manage (new Gtk::TreeView ());
|
||||
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 ());
|
||||
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"));
|
||||
addBookmark->set_image (*addimg);
|
||||
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::VBox* bmBox = Gtk::manage (new Gtk::VBox ());
|
||||
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);
|
||||
|
||||
if (bookmarkSupport)
|
||||
pack_end (*bmFrame, Gtk::PACK_SHRINK, 4);
|
||||
if (bookmarkSupport){
|
||||
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 ());
|
||||
bscrollw->add (*bTreeView);
|
||||
|
@ -56,6 +56,7 @@ class History : public Gtk::VBox, public PParamsChangeListener {
|
||||
BookmarkColumns bookmarkColumns;
|
||||
|
||||
protected:
|
||||
Gtk::VPaned* historyVPaned;
|
||||
Gtk::ScrolledWindow* hscrollw;
|
||||
Gtk::TreeView* hTreeView;
|
||||
Glib::RefPtr<Gtk::ListStore> historyModel;
|
||||
|
Loading…
x
Reference in New Issue
Block a user