Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-27 16:35:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch

Browse source 
Fix Windows 7 32b Compilation from scratch.
This commit is contained in:
defnax 2015-11-06 01:58:30 +01:00
commit c41f98cb4c
22 changed files with 1257 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

14
retroshare-gui/src/retroshare-gui.pro
View file

@ -174,13 +174,12 @@ win32 {
#LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats"
#QTPLUGIN += qjpeg
LIBS_DIR = $$PWD/../../../libs
LIBS += -L"$$LIBS_DIR/lib"
for(lib, LIB_DIR):LIBS += -L"$$lib"
for(bin, BIN_DIR):LIBS += -L"$$bin"
LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz -lws2_32
LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32
LIBS += -lole32 -lwinmm
LIBS += -lwinmm
RC_FILE = gui/images/retroshare_win.rc
# export symbols for the plugins
@ -191,11 +190,8 @@ win32 {
DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
DEPENDPATH += .
INCLUDEPATH += .
DEPENDPATH += $$LIBS_DIR/include
INCLUDEPATH += $$LIBS_DIR/include
DEPENDPATH += . $$INC_DIR
INCLUDEPATH += . $$INC_DIR
greaterThan(QT_MAJOR_VERSION, 4) {
# Qt 5

32
retroshare-gui/src/util/printpreview.cpp
View file

@ -38,7 +38,6 @@
#include "printpreview.h"
#include <QAbstractScrollArea>
#include <QPrintDialog>
#include <QPrinter>
#include <QToolBar>
@ -70,35 +69,6 @@ static inline qreal mmToInches(double mm)
return mm*0.039370147;
}
class PreviewView : public QAbstractScrollArea
{
Q_OBJECT
public:
PreviewView(QTextDocument *document, PrintPreview *printPrev);
inline void updateLayout() { resizeEvent(0); viewport()->update(); }
public slots:
void zoomIn();
void zoomOut();
protected:
virtual void paintEvent(QPaintEvent *e);
virtual void resizeEvent(QResizeEvent *);
virtual void mousePressEvent(QMouseEvent *e);
virtual void mouseMoveEvent(QMouseEvent *e);
virtual void mouseReleaseEvent(QMouseEvent *e);
private:
void paintPage(QPainter *painter, int page);
QTextDocument *doc;
qreal scale;
int interPageSpacing;
QPoint mousePressPos;
QPoint scrollBarValuesOnMousePress;
PrintPreview *printPreview;
};
PreviewView::PreviewView(QTextDocument *document, PrintPreview *printPrev)
: printPreview(printPrev)
{
@ -330,5 +300,3 @@ void PrintPreview::pageSetup()
view->updateLayout();
}
}
#include "printpreview.moc"

30
retroshare-gui/src/util/printpreview.h
View file

@ -39,6 +39,7 @@
#ifndef PRINTPREVIEW_H
#define PRINTPREVIEW_H
#include <QAbstractScrollArea>
#include <QMainWindow>
#include <QPrinter>
#include <QPointF>
@ -69,5 +70,34 @@ private:
QPrinter printer;
};
class PreviewView : public QAbstractScrollArea
{
Q_OBJECT
public:
PreviewView(QTextDocument *document, PrintPreview *printPrev);
inline void updateLayout() { resizeEvent(0); viewport()->update(); }
public slots:
void zoomIn();
void zoomOut();
protected:
virtual void paintEvent(QPaintEvent *e);
virtual void resizeEvent(QResizeEvent *);
virtual void mousePressEvent(QMouseEvent *e);
virtual void mouseMoveEvent(QMouseEvent *e);
virtual void mouseReleaseEvent(QMouseEvent *e);
private:
void paintPage(QPainter *painter, int page);
QTextDocument *doc;
qreal scale;
int interPageSpacing;
QPoint mousePressPos;
QPoint scrollBarValuesOnMousePress;
PrintPreview *printPreview;
};
#endif // PRINTPREVIEW_H