anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-01 21:45:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* GuiPrefs.{cpp,h}:

Browse Source 
- update screen font sizes in dialog after prefs change, since the localization of float values might have changed.
	  (fixes bug 6771).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37035 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2010-12-29 13:50:22 +00:00
parent 7726d055fc
commit a2b087e75f
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/frontends/qt4/GuiPrefs.cpp
View File

@ -1003,6 +1003,18 @@ void PrefScreenFonts::update(LyXRC const & rc)
selectTypewriter(screenTypewriterCO->currentText()); selectTypewriter(screenTypewriterCO->currentText());
screenZoomSB->setValue(rc.zoom); screenZoomSB->setValue(rc.zoom);
updateScreenFontSizes(rc);
pixmapCacheCB->setChecked(rc.use_pixmap_cache);
#if defined(Q_WS_X11)
pixmapCacheCB->setEnabled(false);
#endif
}
void PrefScreenFonts::updateScreenFontSizes(LyXRC const & rc)
{
doubleToWidget(screenTinyED, rc.font_sizes[FONT_SIZE_TINY]); doubleToWidget(screenTinyED, rc.font_sizes[FONT_SIZE_TINY]);
doubleToWidget(screenSmallestED, rc.font_sizes[FONT_SIZE_SCRIPT]); doubleToWidget(screenSmallestED, rc.font_sizes[FONT_SIZE_SCRIPT]);
doubleToWidget(screenSmallerED, rc.font_sizes[FONT_SIZE_FOOTNOTE]); doubleToWidget(screenSmallerED, rc.font_sizes[FONT_SIZE_FOOTNOTE]);
@ -1013,12 +1025,6 @@ void PrefScreenFonts::update(LyXRC const & rc)
doubleToWidget(screenLargestED, rc.font_sizes[FONT_SIZE_LARGEST]); doubleToWidget(screenLargestED, rc.font_sizes[FONT_SIZE_LARGEST]);
doubleToWidget(screenHugeED, rc.font_sizes[FONT_SIZE_HUGE]); doubleToWidget(screenHugeED, rc.font_sizes[FONT_SIZE_HUGE]);
doubleToWidget(screenHugerED, rc.font_sizes[FONT_SIZE_HUGER]); doubleToWidget(screenHugerED, rc.font_sizes[FONT_SIZE_HUGER]);
pixmapCacheCB->setChecked(rc.use_pixmap_cache);
#if defined(Q_WS_X11)
pixmapCacheCB->setEnabled(false);
#endif
} }
@ -3077,7 +3083,10 @@ GuiPreferences::GuiPreferences(GuiView & lv)
addModule(new PrefUserInterface(this)); addModule(new PrefUserInterface(this));
addModule(new PrefEdit(this)); addModule(new PrefEdit(this));
addModule(new PrefShortcuts(this)); addModule(new PrefShortcuts(this));
addModule(new PrefScreenFonts(this)); PrefScreenFonts * screenfonts = new PrefScreenFonts(this);
connect(this, SIGNAL(prefsApplied(LyXRC const &)),
screenfonts, SLOT(updateScreenFontSizes(LyXRC const &)));
addModule(screenfonts);
addModule(new PrefColors(this)); addModule(new PrefColors(this));
addModule(new PrefDisplay(this)); addModule(new PrefDisplay(this));
addModule(new PrefInput(this)); addModule(new PrefInput(this));
@ -3185,6 +3194,9 @@ void GuiPreferences::dispatchParams()
ostringstream ss; ostringstream ss;
rc_.write(ss, true); rc_.write(ss, true);
dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str())); dispatch(FuncRequest(LFUN_LYXRC_APPLY, ss.str()));
// issue prefsApplied signal. This will update the
// localized screen font sizes.
prefsApplied(rc_);
// FIXME: these need lfuns // FIXME: these need lfuns
// FIXME UNICODE // FIXME UNICODE
Author const & author = Author const & author =

6
src/frontends/qt4/GuiPrefs.h
View File

@ -71,6 +71,9 @@ public:
public Q_SLOTS: public Q_SLOTS:
void change_adaptor(); void change_adaptor();
Q_SIGNALS:
void prefsApplied(LyXRC const & rc);
public: public:
/// Apply changes /// Apply changes
void applyView(); void applyView();
@ -240,6 +243,9 @@ private Q_SLOTS:
void selectRoman(const QString&); void selectRoman(const QString&);
void selectSans(const QString&); void selectSans(const QString&);
void selectTypewriter(const QString&); void selectTypewriter(const QString&);
public Q_SLOTS:
void updateScreenFontSizes(LyXRC const & rc);
}; };