summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-10 22:18:48 (UTC)
committer zecke <zecke>2002-09-10 22:18:48 (UTC)
commitaa056d16a0bed859dbe23dc93a7220181b216634 (patch) (unidiff)
tree52942f64e98ab217600e31df61d6b9ecdf1db3a7
parent26ef77469fd6452450eb18e12e231d471673dca8 (diff)
downloadopie-aa056d16a0bed859dbe23dc93a7220181b216634.zip
opie-aa056d16a0bed859dbe23dc93a7220181b216634.tar.gz
opie-aa056d16a0bed859dbe23dc93a7220181b216634.tar.bz2
Compile fix for Qtopia1.6
selected() -> selectedDocument() CCMAIL leseb@handhelds.org
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/importdialog.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/noncore/graphics/drawpad/importdialog.cpp b/noncore/graphics/drawpad/importdialog.cpp
index 0783ed8..1c447cb 100644
--- a/noncore/graphics/drawpad/importdialog.cpp
+++ b/noncore/graphics/drawpad/importdialog.cpp
@@ -46,61 +46,63 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
46 46
47 QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); 47 QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4);
48 QHBoxLayout* previewLayout = new QHBoxLayout(4); 48 QHBoxLayout* previewLayout = new QHBoxLayout(4);
49 QVBoxLayout* previewSecondLayout = new QVBoxLayout(4); 49 QVBoxLayout* previewSecondLayout = new QVBoxLayout(4);
50 50
51 previewSecondLayout->addWidget(m_pAutomaticPreviewCheckBox); 51 previewSecondLayout->addWidget(m_pAutomaticPreviewCheckBox);
52 previewSecondLayout->addWidget(previewPushButton); 52 previewSecondLayout->addWidget(previewPushButton);
53 previewSecondLayout->addStretch(); 53 previewSecondLayout->addStretch();
54 54
55 previewLayout->addWidget(m_pPreviewLabel); 55 previewLayout->addWidget(m_pPreviewLabel);
56 previewLayout->addLayout(previewSecondLayout); 56 previewLayout->addLayout(previewSecondLayout);
57 57
58 mainLayout->addWidget(m_pFileSelector); 58 mainLayout->addWidget(m_pFileSelector);
59 mainLayout->addLayout(previewLayout); 59 mainLayout->addLayout(previewLayout);
60 60
61 preview(); 61 preview();
62} 62}
63 63
64ImportDialog::~ImportDialog() 64ImportDialog::~ImportDialog()
65{ 65{
66} 66}
67 67
68const DocLnk* ImportDialog::selected() 68const DocLnk* ImportDialog::selected()
69{ 69{
70 return m_pFileSelector->selected(); 70 // FIXME change from pointer to reference -zecke
71 DocLnk *lnk = new DocLnk( m_pFileSelector->selectedDocument() );
72 return lnk;
71} 73}
72 74
73void ImportDialog::fileChanged() 75void ImportDialog::fileChanged()
74{ 76{
75 if (m_pAutomaticPreviewCheckBox->isChecked()) { 77 if (m_pAutomaticPreviewCheckBox->isChecked()) {
76 preview(); 78 preview();
77 } 79 }
78} 80}
79 81
80void ImportDialog::preview() 82void ImportDialog::preview()
81{ 83{
82 const DocLnk* docLnk = m_pFileSelector->selected(); 84 const DocLnk* docLnk = selected();
83 85
84 if (docLnk) { 86 if (docLnk) {
85 QImage image(docLnk->file()); 87 QImage image(docLnk->file());
86 88
87 int previewWidth = m_pPreviewLabel->contentsRect().width(); 89 int previewWidth = m_pPreviewLabel->contentsRect().width();
88 int previewHeight = m_pPreviewLabel->contentsRect().height(); 90 int previewHeight = m_pPreviewLabel->contentsRect().height();
89 91
90 float widthScale = 1.0; 92 float widthScale = 1.0;
91 float heightScale = 1.0; 93 float heightScale = 1.0;
92 94
93 if (previewWidth < image.width()) { 95 if (previewWidth < image.width()) {
94 widthScale = (float)previewWidth / float(image.width()); 96 widthScale = (float)previewWidth / float(image.width());
95 } 97 }
96 98
97 if (previewHeight < image.height()) { 99 if (previewHeight < image.height()) {
98 heightScale = (float)previewHeight / float(image.height()); 100 heightScale = (float)previewHeight / float(image.height());
99 } 101 }
100 102
101 float scale = (widthScale < heightScale ? widthScale : heightScale); 103 float scale = (widthScale < heightScale ? widthScale : heightScale);
102 QImage previewImage = image.smoothScale((int)(image.width() * scale) , (int)(image.height() * scale)); 104 QImage previewImage = image.smoothScale((int)(image.width() * scale) , (int)(image.height() * scale));
103 105
104 QPixmap previewPixmap; 106 QPixmap previewPixmap;
105 previewPixmap.convertFromImage(previewImage); 107 previewPixmap.convertFromImage(previewImage);
106 108