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

Merge branch 'dev' into issue5867

Browse Source 
Conflicts (resolved manually):
	rtdata/languages/default
	rtgui/options.cc
This commit is contained in:
rfranke
2020-08-11 18:40:47 +02:00
parent e63b800864 130fbb8eb2
commit 01df366c06
29 changed files with 2578 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/preferences.cc
View File

@@ -10,8 +10,8 @@
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
@@ -946,7 +946,8 @@ Gtk::Widget* Preferences::getGeneralPanel()
setExpandAlignProperties(complexitylocal, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
complexitylocal->append(M("PREFERENCES_COMPLEXITY_EXP"));
complexitylocal->append(M("PREFERENCES_COMPLEXITY_NORM"));
complexitylocal->set_active(1);
complexitylocal->append(M("PREFERENCES_COMPLEXITY_SIMP"));
complexitylocal->set_active(2);
workflowGrid->attach_next_to(*complexityL, *curveBBoxPosL, Gtk::POS_BOTTOM, 1, 1);
workflowGrid->attach_next_to(*complexitylocal, *curveBBoxPosC, Gtk::POS_BOTTOM, 1, 1);