merge with dev

This commit is contained in:
Desmis
2018-02-15 16:57:23 +01:00
61 changed files with 201 additions and 4414 deletions

View File

@@ -872,7 +872,7 @@ bool ToolPanelCoordinator::handleShortcutKey(GdkEventKey* event)
void ToolPanelCoordinator::updateVScrollbars(bool hide)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
Gtk::PolicyType policy = hide ? Gtk::POLICY_NEVER : Gtk::POLICY_AUTOMATIC;
exposurePanelSW->set_policy(Gtk::POLICY_AUTOMATIC, policy);
detailsPanelSW->set_policy(Gtk::POLICY_AUTOMATIC, policy);
@@ -889,7 +889,7 @@ void ToolPanelCoordinator::updateVScrollbars(bool hide)
void ToolPanelCoordinator::updateTabsHeader(bool useIcons)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
TOITypes type = useIcons ? TOI_ICON : TOI_TEXT;
toiE->switchTo(type);
@@ -916,7 +916,7 @@ void ToolPanelCoordinator::updateTabsUsesIcons(bool useIcons)
void ToolPanelCoordinator::toolSelected(ToolMode tool)
{
GThreadLock lock; // All GUI acces from idle_add callbacks or separate thread HAVE to be protected
GThreadLock lock; // All GUI access from idle_add callbacks or separate thread HAVE to be protected
switch (tool) {
case TMCropSelect: