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

Merge with dev

Browse Source
This commit is contained in:
Desmis
2019-03-17 10:45:17 +01:00
parent bf58e43236 86550c167f
commit cf27de89e2
977 changed files with 5170 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/preferences.cc
View File

@@ -22,7 +22,6 @@
#include "splash.h"
#include "cachemanager.h"
#include "addsetids.h"
#include "../rtengine/icons.h"
#include "../rtengine/dfmanager.h"
#include "../rtengine/ffmanager.h"
#include <sstream>
@@ -901,7 +900,7 @@ Gtk::Widget* Preferences::getGeneralPanel()
Gtk::Label* flayoutlab = Gtk::manage(new Gtk::Label(M("PREFERENCES_EDITORLAYOUT") + ":"));
setExpandAlignProperties(flayoutlab, false, false, Gtk::ALIGN_START, Gtk::ALIGN_BASELINE);
editorLayout = Gtk::manage(new Gtk::ComboBoxText());
editorLayout = Gtk::manage (new MyComboBoxText ());
setExpandAlignProperties(editorLayout, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_BASELINE);
editorLayout->append(M("PREFERENCES_SINGLETAB"));
editorLayout->append(M("PREFERENCES_SINGLETABVERTAB"));
@@ -2119,7 +2118,6 @@ void Preferences::cancelPressed()
{
// set the initial theme back
if (themeFNames.at (themeCBT->get_active_row_number ()).longFName != options.theme) {
rtengine::setPaths();
RTImage::updateImages();
switchThemeTo(options.theme);
}
@@ -2177,7 +2175,6 @@ void Preferences::themeChanged()
{
moptions.theme = themeFNames.at (themeCBT->get_active_row_number ()).longFName;
rtengine::setPaths();
RTImage::updateImages();
switchThemeTo(moptions.theme);
}
@@ -2353,11 +2350,11 @@ void Preferences::switchFontTo(const Glib::ustring &newFontFamily, const int new
try {
//GTK318
#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
fontcss->load_from_data(Glib::ustring::compose("* { font-family: %1; font-size: %2px }", newFontFamily, newFontSize));
#else
fontcss->load_from_data(Glib::ustring::compose("* { font-family: %1; font-size: %2pt }", newFontFamily, newFontSize));
#endif
//#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 20
// fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2px }", newFontFamily, newFontSize * RTScalable::getScale()));
//#else
fontcss->load_from_data (Glib::ustring::compose ("* { font-family: %1; font-size: %2pt }", newFontFamily, newFontSize * RTScalable::getScale()));
//#endif
//GTK318
} catch (Glib::Error &err) {
printf("Error: \"%s\"\n", err.what().c_str());