From 615176c17202f1a8aa7aa504b8dd747b089385a9 Mon Sep 17 00:00:00 2001 From: leseb Date: Thu, 13 Jun 2002 17:11:03 +0000 Subject: More progress in page attributes --- diff --git a/noncore/graphics/drawpad/page.cpp b/noncore/graphics/drawpad/page.cpp index 35ec0e0..7034a20 100644 --- a/noncore/graphics/drawpad/page.cpp +++ b/noncore/graphics/drawpad/page.cpp @@ -16,18 +16,42 @@ Page::Page() : QPixmap() { + m_lastModified = QDateTime::currentDateTime(); } Page::Page(int w, int h) : QPixmap(w, h) { + m_lastModified = QDateTime::currentDateTime(); } Page::Page(const QSize& size) : QPixmap(size) { + m_lastModified = QDateTime::currentDateTime(); } Page::~Page() { } + +QString Page::title() const +{ + return m_title; +} + +QDateTime Page::lastModified() const +{ + return m_lastModified; +} + +void Page::setTitle(QString title) +{ + m_title = title; +} + +void Page::setLastModified(QDateTime lastModified) +{ + m_lastModified = lastModified; +} + diff --git a/noncore/graphics/drawpad/page.h b/noncore/graphics/drawpad/page.h index 888f552..020ab1f 100644 --- a/noncore/graphics/drawpad/page.h +++ b/noncore/graphics/drawpad/page.h @@ -16,6 +16,8 @@ #include +#include + class Page : public QPixmap { public: @@ -24,6 +26,16 @@ public: Page(const QSize& size); ~Page(); + + QString title() const; + QDateTime lastModified() const; + + void setTitle(QString title); + void setLastModified(QDateTime lastModified); + +private: + QString m_title; + QDateTime m_lastModified; }; #endif // PAGE_H diff --git a/noncore/graphics/drawpad/pageinformationdialog.cpp b/noncore/graphics/drawpad/pageinformationdialog.cpp index 54cf89d..c0d055e 100644 --- a/noncore/graphics/drawpad/pageinformationdialog.cpp +++ b/noncore/graphics/drawpad/pageinformationdialog.cpp @@ -15,6 +15,9 @@ #include "page.h" +#include +#include + #include #include #include @@ -30,7 +33,12 @@ PageInformationDialog::PageInformationDialog(Page* page, QWidget* parent, const QGroupBox* generalGroupBox = new QGroupBox(0, Qt::Vertical, tr("General"), this); QLabel* titleLabel = new QLabel(tr("Title:"), generalGroupBox); + m_pTitleLineEdit = new QLineEdit(generalGroupBox); + m_pTitleLineEdit->setText(page->title()); + + QLabel* dateLabel = new QLabel(tr("Date:"), generalGroupBox); + QLabel* dateValueLabel = new QLabel(dateTimeString(m_pPage->lastModified()), generalGroupBox); QGroupBox* sizeGroupBox = new QGroupBox(0, Qt::Vertical, tr("Size"), this); @@ -43,11 +51,15 @@ PageInformationDialog::PageInformationDialog(Page* page, QWidget* parent, const QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); generalGroupBox->layout()->setSpacing(4); sizeGroupBox->layout()->setSpacing(4); - QGridLayout* generalLayout = new QGridLayout(generalGroupBox->layout(), 1, 1); + QGridLayout* generalLayout = new QGridLayout(generalGroupBox->layout(), 2, 2); QGridLayout* sizeLayout = new QGridLayout(sizeGroupBox->layout(), 2, 2); generalLayout->addWidget(titleLabel, 0, 0); generalLayout->addWidget(m_pTitleLineEdit, 0, 1); + generalLayout->addWidget(dateLabel, 1, 0); + generalLayout->addWidget(dateValueLabel, 1, 1); + + generalLayout->setColStretch(1, 1); sizeLayout->addWidget(widthLabel, 0, 0); sizeLayout->addWidget(widthValueLabel, 0, 1); @@ -68,3 +80,38 @@ QString PageInformationDialog::selectedTitle() { return (m_pTitleLineEdit->text()); } + +QString PageInformationDialog::dateTimeString(QDateTime dateTime) +{ + QString result; + + Config config("qpe"); + config.setGroup("Date"); + + QChar separator = config.readEntry("Separator", "/")[0]; + DateFormat::Order shortOrder = (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear); + + for (int i = 0; i < 3; i++) { + switch((shortOrder >> (i * 3)) & 0x0007) { + case 0x0001: + result += QString().sprintf("%02d", dateTime.date().day()); + break; + case 0x0002: + result += QString().sprintf("%02d", dateTime.date().month()); + break; + case 0x0004: + result += QString().sprintf("%04d", dateTime.date().year()); + break; + default: + break; + } + + if (i < 2) { + result += separator; + } + } + + result += QString().sprintf(" %02d:%02d", dateTime.time().hour(), dateTime.time().minute()); + + return result; +} diff --git a/noncore/graphics/drawpad/pageinformationdialog.h b/noncore/graphics/drawpad/pageinformationdialog.h index cce74ec..60662a9 100644 --- a/noncore/graphics/drawpad/pageinformationdialog.h +++ b/noncore/graphics/drawpad/pageinformationdialog.h @@ -18,6 +18,8 @@ class Page; +#include + class QLineEdit; class PageInformationDialog : public QDialog @@ -31,6 +33,8 @@ public: QString selectedTitle(); private: + QString dateTimeString(QDateTime dateTime); + Page* m_pPage; QLineEdit* m_pTitleLineEdit; diff --git a/noncore/graphics/drawpad/thumbnailview.cpp b/noncore/graphics/drawpad/thumbnailview.cpp index 1eadc13..35955e8 100644 --- a/noncore/graphics/drawpad/thumbnailview.cpp +++ b/noncore/graphics/drawpad/thumbnailview.cpp @@ -18,7 +18,9 @@ #include "newpagedialog.h" #include "page.h" +#include #include +#include #include #include @@ -54,10 +56,10 @@ PageListBoxItem::PageListBoxItem(Page* page, QListBox* parent) m_thumbnail.convertFromImage(thumbnailImage); - m_titleText = QObject::tr("Title:") + " -"; + m_titleText = QObject::tr("Title:") + " " + m_pPage->title(); m_dimensionText = QObject::tr("Dimension:") + " " + QString::number(m_pPage->width()) + "x" + QString::number(m_pPage->height()); - m_dateTimeText = QObject::tr("Date:") + " -"; + m_dateText = QObject::tr("Date:") + " " + dateTimeString(m_pPage->lastModified()); QColor baseColor = parent->colorGroup().base(); int h, s, v; @@ -86,7 +88,7 @@ int PageListBoxItem::width(const QListBox* lb) const QFontMetrics fontMetrics = lb->fontMetrics(); int maxtextLength = QMAX(fontMetrics.width(m_titleText), QMAX(fontMetrics.width(m_dimensionText), - fontMetrics.width(m_dateTimeText))); + fontMetrics.width(m_dateText))); return QMAX(THUMBNAIL_SIZE + maxtextLength + 8, QApplication::globalStrut().width()); } @@ -117,7 +119,7 @@ void PageListBoxItem::paint(QPainter *painter) painter->setFont(standardFont); painter->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, m_dimensionText); - painter->drawText(textRect, Qt::AlignLeft | Qt::AlignBottom, m_dateTimeText); + painter->drawText(textRect, Qt::AlignLeft | Qt::AlignBottom, m_dateText); if (!selected() && !(listBox()->hasFocus() && listBox()->item(listBox()->currentItem()) == this)) { painter->drawLine(0, itemRect.height() - 1, itemRect.width() - 1, itemRect.height() - 1); @@ -129,6 +131,41 @@ Page* PageListBoxItem::page() const return m_pPage; } +QString PageListBoxItem::dateTimeString(QDateTime dateTime) +{ + QString result; + + Config config("qpe"); + config.setGroup("Date"); + + QChar separator = config.readEntry("Separator", "/")[0]; + DateFormat::Order shortOrder = (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear); + + for (int i = 0; i < 3; i++) { + switch((shortOrder >> (i * 3)) & 0x0007) { + case 0x0001: + result += QString().sprintf("%02d", dateTime.date().day()); + break; + case 0x0002: + result += QString().sprintf("%02d", dateTime.date().month()); + break; + case 0x0004: + result += QString().sprintf("%04d", dateTime.date().year()); + break; + default: + break; + } + + if (i < 2) { + result += separator; + } + } + + result += QString().sprintf(" %02d:%02d", dateTime.time().hour(), dateTime.time().minute()); + + return result; +} + PageListBox::PageListBox(DrawPadCanvas* drawPadCanvas, QWidget* parent, const char* name) : QListBox(parent, name) { diff --git a/noncore/graphics/drawpad/thumbnailview.h b/noncore/graphics/drawpad/thumbnailview.h index 88c3b27..2eac667 100644 --- a/noncore/graphics/drawpad/thumbnailview.h +++ b/noncore/graphics/drawpad/thumbnailview.h @@ -21,6 +21,8 @@ class DrawPad; class DrawPadCanvas; class Page; +#include + class QToolButton; class PageListBoxItem : public QListBoxItem @@ -36,13 +38,15 @@ public: Page* page() const; private: + QString dateTimeString(QDateTime dateTime); + Page* m_pPage; QPixmap m_thumbnail; QString m_titleText; QString m_dimensionText; - QString m_dateTimeText; + QString m_dateText; QColor m_alternateColor; }; -- cgit v0.9.0.2