[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/graphics/digikam/utilities/imageeditor/printiface
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2011-01-20 9:11:30
Message-ID: 20110120091130.D71D4AC8B7 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1215914 by cgilles:
more private internal container. Polish
M +13 -3 printhelper.cpp
M +3 -4 printhelper.h
M +13 -4 printoptionspage.cpp
M +3 -3 printoptionspage.h
M +3 -3 signalblocker.h
--- trunk/extragear/graphics/digikam/utilities/imageeditor/printiface/printhelper.cpp \
#1215913:1215914 @@ -5,7 +5,7 @@
*
* Date : 2009-02-06
* Description : image editor printing interface.
- * inspired from Gwenview code (Aurélien Gâteau).
+ * inspired from Gwenview code (Aurelien Gateau).
*
* Copyright (C) 2009 by Angelo Naselli <anaselli at linux dot it>
*
@@ -30,6 +30,7 @@
// Qt includes
+#include <QWidget>
#include <QCheckBox>
#include <QPainter>
#include <QPrinter>
@@ -48,13 +49,22 @@
namespace Digikam
{
-class PrintHelperPrivate
+class PrintHelper::PrintHelperPrivate
{
public:
+public:
+
+ PrintHelperPrivate() :
+ mParent(0)
+ {
+ }
+
QWidget* mParent;
+public:
+
QSize adjustSize ( PrintOptionsPage* optionsPage, DImg& doc, int \
printerResolution, const QSize& viewportSize ) {
QSize size = doc.size();
@@ -193,4 +203,4 @@
painter.drawImage ( 0, 0, image );
}
-} // namespace
+} // namespace Digikam
--- trunk/extragear/graphics/digikam/utilities/imageeditor/printiface/printhelper.h \
#1215913:1215914 @@ -5,7 +5,7 @@
*
* Date : 2009-02-06
* Description : image editor printing interface.
- * inspired from Gwenview code (Aurélien Gâteau).
+ * inspired from Gwenview code (Aurelien Gateau).
*
* Copyright (C) 2009 by Angelo Naselli <anaselli at linux dot it>
*
@@ -35,8 +35,6 @@
namespace Digikam
{
-class PrintHelperPrivate;
-
class DIGIKAM_EXPORT PrintHelper
{
@@ -49,9 +47,10 @@
private:
+ class PrintHelperPrivate;
PrintHelperPrivate* const d;
};
-} // namespace
+} // namespace Digikam
#endif /* PRINTHELPER_H */
--- trunk/extragear/graphics/digikam/utilities/imageeditor/printiface/printoptionspage.cpp \
#1215913:1215914 @@ -5,7 +5,7 @@
*
* Date : 2009-02-06
* Description : image editor printing interface.
- * inspired from Gwenview code (Aurélien Gâteau).
+ * inspired from Gwenview code (Aurelien Gateau).
*
* Copyright (C) 2009 by Angelo Naselli <anaselli at linux dot it>
*
@@ -69,10 +69,18 @@
}
}
-class PrintOptionsPagePrivate : public Ui_PrintOptionsPage
+class PrintOptionsPage::PrintOptionsPagePrivate : public Ui_PrintOptionsPage
{
public:
+ PrintOptionsPagePrivate() :
+ mParent(0),
+ colorManaged(0),
+ cmPreferences(0),
+ cmEnabled(false)
+ {
+ }
+
QWidget* mParent;
QSize mImageSize;
QButtonGroup mScaleGroup;
@@ -83,6 +91,8 @@
QPushButton* cmPreferences;
bool cmEnabled;
+public:
+
void initColorManagement()
{
colorManaged = new QCheckBox(i18n("Use Color Management for Printing"), \
cmbox); @@ -166,7 +176,6 @@
{
d->setupUi ( this );
d->mParent = parent;
- d->cmEnabled = false;
d->mImageSize = imageSize;
d->mConfigDialogManager = new KConfigDialogManager(this, DigikamConfig::self());
@@ -342,4 +351,4 @@
editor->setupICC();
}
-} // namespace
+} // namespace DigiKam
--- trunk/extragear/graphics/digikam/utilities/imageeditor/printiface/printoptionspage.h \
#1215913:1215914 @@ -5,7 +5,7 @@
*
* Date : 2009-02-06
* Description : image editor printing interface.
- * inspired from Gwenview code (Aurélien Gâteau).
+ * inspired from Gwenview code (Aurelien Gateau).
*
* Copyright (C) 2009 by Angelo Naselli <anaselli at linux dot it>
*
@@ -33,7 +33,6 @@
{
class IccProfile;
-class PrintOptionsPagePrivate;
class PrintOptionsPage : public QWidget
{
@@ -81,9 +80,10 @@
private:
+ class PrintOptionsPagePrivate;
PrintOptionsPagePrivate* const d;
};
-} // namespace
+} // namespace Digikam
#endif /* PRINTOPTIONSPAGE_H */
--- trunk/extragear/graphics/digikam/utilities/imageeditor/printiface/signalblocker.h \
#1215913:1215914 @@ -5,9 +5,9 @@
*
* Date : 2009-02-06
* Description : image editor printing interface.
- * inspired from Gwenview code (Aurélien Gâteau).
+ * inspired from Gwenview code (Aurelien Gateau).
*
- * Copyright (C) 2009 by Angelo Naselli <anaselli at linux dot it>
+ * Copyright (C) 2009-2011 by Angelo Naselli <anaselli at linux dot it>
*
* This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
@@ -58,6 +58,6 @@
QObject* mObject;
};
-} // namespace
+} // namespace Digikam
#endif /* SIGNALBLOCKER_H */
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic