On Thursday 17 October 2002 1:03 pm, Lars Gullik Bjønnes wrote:
> Now when dpi is not used when calculating fontsize in qt,
> Where is dpi used now?
>
> Ok... PreviewLoader use it:
> graphics/PreviewLoader.C: font_scaling_factor_ = 0.01 *
> lyxrc.dpi * lyxrc. zoom *
>
> and lyxlength:
>
> lyxlength.C: // DPI setting for monitor: pixels/inch
> lyxlength.C: double const dpi = lyxrc.dpi; // screen
> resolution [pixels/inch] lyxlength.C: result = zoom
> * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_
> lyxlength.C: result = zoom * dpi * val_;
>
>
> and some handling in lyxrc, and that is all.
>
> I guess the above change should be done, can you send the
> finished patch?
On Thursday 17 October 2002 1:04 pm, Lars Gullik Bjønnes wrote:
> Angus Leeming <[EMAIL PROTECTED]> writes:
> | Compiling this file I get the follwoing warnings:
> |
> | QBrowseBox.C: In method `QBrowseBox::QBrowseBox(int, int,
> If everything still works, then yes.
Patch to both appended. Ok?
Angus
Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.247
diff -u -p -r1.247 ChangeLog
--- src/frontends/qt2/ChangeLog 17 Oct 2002 09:51:18 -0000 1.247
+++ src/frontends/qt2/ChangeLog 17 Oct 2002 12:52:11 -0000
@@ -1,9 +1,14 @@
+2002-10-17 Angus Leeming <[EMAIL PROTECTED]>
+
+ * lyx_gui.C (getDPI): use an average of DpiX and DpiY.
+
+ * QBrowseBox.[Ch] (c-tor): remove unneeded arguments.
2002-10-17 André Pönitz <[EMAIL PROTECTED]>
* QBrowseBox.[Ch]: fix style issues
-2002-10-16 Angus Leeming <[EMAIL PROTECTED]>
+2002-10-17 Angus Leeming <[EMAIL PROTECTED]>
* ui/moc/Makefile.am:
* moc/Makefile.am: add a distclean-local target to remove *_moc.C.
Index: src/frontends/qt2/QBrowseBox.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QBrowseBox.C,v
retrieving revision 1.4
diff -u -p -r1.4 QBrowseBox.C
--- src/frontends/qt2/QBrowseBox.C 17 Oct 2002 09:51:18 -0000 1.4
+++ src/frontends/qt2/QBrowseBox.C 17 Oct 2002 12:52:11 -0000
@@ -25,8 +25,7 @@
#include "QBrowseBox.h"
-QBrowseBox::QBrowseBox(int rows, int cols, QWidget * parent,
- char const * name, WFlags fl)
+QBrowseBox::QBrowseBox(int rows, int cols)
: QGridView()
{
setNumRows(rows);
@@ -157,7 +156,7 @@ void QBrowseBox::keyPressEvent(QKeyEvent
}
-void QBrowseBox::mouseReleaseEvent(QMouseEvent * e)
+void QBrowseBox::mouseReleaseEvent(QMouseEvent *)
{
qWarning("mouse release");
emit selected( activecell_.x(), activecell_.y());
Index: src/frontends/qt2/QBrowseBox.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QBrowseBox.h,v
retrieving revision 1.2
diff -u -p -r1.2 QBrowseBox.h
--- src/frontends/qt2/QBrowseBox.h 17 Oct 2002 09:51:18 -0000 1.2
+++ src/frontends/qt2/QBrowseBox.h 17 Oct 2002 12:52:12 -0000
@@ -27,8 +27,7 @@ class QBrowseBox : public QGridView
{
Q_OBJECT
public:
- QBrowseBox(int rows, int cols, QWidget * parent = 0,
- char const * name = 0, WFlags f = 0);
+ QBrowseBox(int rows, int cols);
~QBrowseBox();
void insertItem(QString const & text, int x, int y);
Index: src/frontends/qt2/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/lyx_gui.C,v
retrieving revision 1.20
diff -u -p -r1.20 lyx_gui.C
--- src/frontends/qt2/lyx_gui.C 14 Oct 2002 20:20:34 -0000 1.20
+++ src/frontends/qt2/lyx_gui.C 17 Oct 2002 12:52:12 -0000
@@ -67,7 +67,7 @@ float getDPI()
{
QWidget w;
QPaintDeviceMetrics pdm(&w);
- return pdm.logicalDpiY();
+ return 0.5 * (pdm.logicalDpiX() + pdm.logicalDpiY());
}
}
