mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-07 02:28:35 +00:00
Show an example of chosen font
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5665 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon
parent
627de563e1
commit
ebac08df7f
@ -73,6 +73,8 @@ libqt2_la_SOURCES = \
|
||||
lyx_gui.C \
|
||||
qcoloritem.h \
|
||||
qcoloritem.C \
|
||||
qfontexample.h \
|
||||
qfontexample.C \
|
||||
qfont_loader.h \
|
||||
qfont_loader.C \
|
||||
qfont_metrics.C \
|
||||
|
||||
@ -453,6 +453,11 @@ void QPrefs::update_contents()
|
||||
}
|
||||
}
|
||||
|
||||
// Fucked if I know why we need this. But we do
|
||||
dialog_->select_roman(roman);
|
||||
dialog_->select_sans(sans);
|
||||
dialog_->select_typewriter(typewriter);
|
||||
|
||||
fontmod->screenZoomSB->setValue(rc.zoom);
|
||||
fontmod->screenDpiSB->setValue(int(rc.dpi));
|
||||
fontmod->screenTinyED->setText(tostr(rc.font_sizes[LyXFont::SIZE_TINY]).c_str());
|
||||
|
||||
@ -52,6 +52,7 @@
|
||||
#include <qcolordialog.h>
|
||||
#include <qcolor.h>
|
||||
#include "qcoloritem.h"
|
||||
#include "qfontexample.h"
|
||||
|
||||
using std::map;
|
||||
using std::endl;
|
||||
@ -183,6 +184,10 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
|
||||
QFontDatabase fontdb;
|
||||
QStringList families(fontdb.families());
|
||||
|
||||
connect(screenfontsModule->screenRomanCO, SIGNAL(activated(const QString&)), this, SLOT(select_roman(const QString&)));
|
||||
connect(screenfontsModule->screenSansCO, SIGNAL(activated(const QString&)), this, SLOT(select_sans(const QString&)));
|
||||
connect(screenfontsModule->screenTypewriterCO, SIGNAL(activated(const QString&)), this, SLOT(select_typewriter(const QString&)));
|
||||
|
||||
for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) {
|
||||
screenfontsModule->screenRomanCO->insertItem(*it);
|
||||
screenfontsModule->screenSansCO->insertItem(*it);
|
||||
@ -572,3 +577,21 @@ void QPrefsDialog::select_lyxpipe()
|
||||
if (!file.empty())
|
||||
pathsModule->lyxserverDirED->setText(file.c_str());
|
||||
}
|
||||
|
||||
|
||||
void QPrefsDialog::select_roman(const QString& name)
|
||||
{
|
||||
screenfontsModule->screenRomanFE->set(QFont(name), name);
|
||||
}
|
||||
|
||||
|
||||
void QPrefsDialog::select_sans(const QString& name)
|
||||
{
|
||||
screenfontsModule->screenSansFE->set(QFont(name), name);
|
||||
}
|
||||
|
||||
|
||||
void QPrefsDialog::select_typewriter(const QString& name)
|
||||
{
|
||||
screenfontsModule->screenTypewriterFE->set(QFont(name), name);
|
||||
}
|
||||
|
||||
@ -81,6 +81,10 @@ public slots:
|
||||
void select_workingdir();
|
||||
void select_lyxpipe();
|
||||
|
||||
void select_roman(const QString&);
|
||||
void select_sans(const QString&);
|
||||
void select_typewriter(const QString&);
|
||||
|
||||
protected:
|
||||
void closeEvent(QCloseEvent * e);
|
||||
|
||||
|
||||
41
src/frontends/qt2/qfontexample.C
Normal file
41
src/frontends/qt2/qfontexample.C
Normal file
@ -0,0 +1,41 @@
|
||||
/**
|
||||
* \file qfontexample.C
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author John Levon
|
||||
*
|
||||
* Full author contact details are available in file CREDITS
|
||||
*/
|
||||
|
||||
|
||||
#include "qfontexample.h"
|
||||
|
||||
#include <qpainter.h>
|
||||
|
||||
void QFontExample::set(QFont const & font, QString const & text)
|
||||
{
|
||||
font_ = font;
|
||||
text_ = text;
|
||||
repaint();
|
||||
}
|
||||
|
||||
|
||||
QSize QFontExample::sizeHint() const
|
||||
{
|
||||
QFontMetrics m(font_);
|
||||
return QSize(m.width(text_) + 10, m.ascent() + m.descent() + 6);
|
||||
}
|
||||
|
||||
|
||||
void QFontExample::paintEvent(QPaintEvent *)
|
||||
{
|
||||
QPainter p;
|
||||
QFontMetrics m(font_);
|
||||
|
||||
p.begin(this);
|
||||
p.setFont(font_);
|
||||
p.drawRect(0, 0, width() - 1, height() - 1);
|
||||
p.drawText(5, 3 + m.ascent(), text_);
|
||||
p.end();
|
||||
}
|
||||
30
src/frontends/qt2/qfontexample.h
Normal file
30
src/frontends/qt2/qfontexample.h
Normal file
@ -0,0 +1,30 @@
|
||||
/**
|
||||
* \file qfontexample.h
|
||||
* This file is part of LyX, the document processor.
|
||||
* Licence details can be found in the file COPYING.
|
||||
*
|
||||
* \author John Levon
|
||||
*
|
||||
* Full author contact details are available in file CREDITS
|
||||
*/
|
||||
|
||||
#include <qwidget.h>
|
||||
#include <qfont.h>
|
||||
|
||||
class QFontExample : public QWidget {
|
||||
|
||||
public:
|
||||
QFontExample(QWidget * parent, const char * name)
|
||||
: QWidget(parent, name) {}
|
||||
|
||||
void set(QFont const & font, QString const & text);
|
||||
|
||||
virtual QSize sizeHint() const;
|
||||
|
||||
protected:
|
||||
virtual void paintEvent(QPaintEvent * p);
|
||||
|
||||
private:
|
||||
QFont font_;
|
||||
QString text_;
|
||||
};
|
||||
@ -13,8 +13,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>270</width>
|
||||
<height>358</height>
|
||||
<width>321</width>
|
||||
<height>344</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
@ -34,7 +34,7 @@
|
||||
<class>QLayoutWidget</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>Layout4</cstring>
|
||||
<cstring>Layout6</cstring>
|
||||
</property>
|
||||
<hbox>
|
||||
<property stdset="1">
|
||||
@ -49,7 +49,14 @@
|
||||
<class>QLayoutWidget</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>Layout4</cstring>
|
||||
<cstring>Layout5</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>minimumSize</name>
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<grid>
|
||||
<property stdset="1">
|
||||
@ -60,6 +67,74 @@
|
||||
<name>spacing</name>
|
||||
<number>6</number>
|
||||
</property>
|
||||
<widget row="1" column="1" >
|
||||
<class>QComboBox</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenSansCO</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>duplicatesEnabled</name>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="1" column="2" >
|
||||
<class>QFontExample</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenSansFE</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>sizePolicy</name>
|
||||
<sizepolicy>
|
||||
<hsizetype>3</hsizetype>
|
||||
<vsizetype>5</vsizetype>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>minimumSize</name>
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="1" column="0" >
|
||||
<class>QLabel</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenSansLA</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>text</name>
|
||||
<string>Sa&ns Serif :</string>
|
||||
</property>
|
||||
<property>
|
||||
<name>buddy</name>
|
||||
<cstring>screenSansCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="0" column="2" >
|
||||
<class>QFontExample</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenRomanFE</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>sizePolicy</name>
|
||||
<sizepolicy>
|
||||
<hsizetype>3</hsizetype>
|
||||
<vsizetype>5</vsizetype>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>minimumSize</name>
|
||||
<size>
|
||||
<width>60</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="0" column="1" >
|
||||
<class>QComboBox</class>
|
||||
<property stdset="1">
|
||||
@ -75,18 +150,18 @@
|
||||
<class>QLabel</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenSansLA</cstring>
|
||||
<cstring>screenTypewriterLA</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>text</name>
|
||||
<string>Sa&ns Serif :</string>
|
||||
<string>T&ypewriter :</string>
|
||||
</property>
|
||||
<property>
|
||||
<name>buddy</name>
|
||||
<cstring>screenSansCO</cstring>
|
||||
<cstring>screenTypewriterCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="0" column="0" rowspan="2" colspan="1" >
|
||||
<widget row="0" column="0" >
|
||||
<class>QLabel</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
@ -101,7 +176,21 @@
|
||||
<cstring>screenRomanCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="3" column="1" >
|
||||
<widget row="2" column="2" >
|
||||
<class>QFontExample</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenTypewriterFE</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>sizePolicy</name>
|
||||
<sizepolicy>
|
||||
<hsizetype>3</hsizetype>
|
||||
<vsizetype>5</vsizetype>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="2" column="1" >
|
||||
<class>QComboBox</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
@ -112,55 +201,8 @@
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="1" column="1" rowspan="2" colspan="1" >
|
||||
<class>QComboBox</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenSansCO</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>duplicatesEnabled</name>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
<widget row="3" column="0" >
|
||||
<class>QLabel</class>
|
||||
<property stdset="1">
|
||||
<name>name</name>
|
||||
<cstring>screenTypewriterLA</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>text</name>
|
||||
<string>T&ypewriter :</string>
|
||||
</property>
|
||||
<property>
|
||||
<name>buddy</name>
|
||||
<cstring>screenTypewriterCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</grid>
|
||||
</widget>
|
||||
<spacer>
|
||||
<property>
|
||||
<name>name</name>
|
||||
<cstring>Spacer3</cstring>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>orientation</name>
|
||||
<enum>Horizontal</enum>
|
||||
</property>
|
||||
<property stdset="1">
|
||||
<name>sizeType</name>
|
||||
<enum>Expanding</enum>
|
||||
</property>
|
||||
<property>
|
||||
<name>sizeHint</name>
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</hbox>
|
||||
</widget>
|
||||
<widget>
|
||||
@ -534,6 +576,28 @@
|
||||
</spacer>
|
||||
</vbox>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>QFontExample</class>
|
||||
<header location="local">qfontexample.h</header>
|
||||
<sizehint>
|
||||
<width>-1</width>
|
||||
<height>-1</height>
|
||||
</sizehint>
|
||||
<container>0</container>
|
||||
<sizepolicy>
|
||||
<hordata>5</hordata>
|
||||
<verdata>5</verdata>
|
||||
</sizepolicy>
|
||||
<pixmap>image0</pixmap>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<images>
|
||||
<image>
|
||||
<name>image0</name>
|
||||
<data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
|
||||
</image>
|
||||
</images>
|
||||
<tabstops>
|
||||
<tabstop>screenZoomSB</tabstop>
|
||||
<tabstop>screenDpiSB</tabstop>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user