← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/docinfo.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/docinfo.cpp
49
49
        layout1->addWidget( authorLabel, 1, 0 );
50
50
        layout1->addWidget( authorEdit, 1, 1 );
51
51
 
 
52
        subjectEdit = new QLineEdit( page1 );
 
53
        subjectLabel = new QLabel( tr("&Subject:"), page1);
 
54
        subjectLabel->setBuddy(subjectEdit);
 
55
        subjectLabel->resize( subjectLabel->sizeHint() );
 
56
        layout1->addWidget( subjectLabel, 2, 0 );
 
57
        layout1->addWidget( subjectEdit, 2, 1 );
 
58
 
52
59
        keywordsEdit = new QTextEdit( page1 );
53
60
        keywordsLabel = new QLabel( tr("&Keywords:"), page1 );
54
61
        keywordsLabel->setBuddy(keywordsEdit);
55
62
        keywordsLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft);
56
63
        keywordsEdit->setMinimumSize(QSize(200, 105));
57
 
        layout1->addWidget( keywordsLabel, 2, 0 );
58
 
        layout1->addWidget( keywordsEdit, 2, 1 );
 
64
        layout1->addWidget( keywordsLabel, 3, 0 );
 
65
        layout1->addWidget( keywordsEdit, 3, 1 );
59
66
 
60
67
        descriptionEdit = new QTextEdit( page1 );
61
68
        descriptionLabel = new QLabel( tr("Descri&ption:"), page1 );
62
69
        descriptionLabel->setBuddy(descriptionEdit);
63
70
        descriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft);
64
71
        descriptionEdit->setMinimumSize(QSize(200, 105));
65
 
        layout1->addWidget( descriptionLabel, 3, 0 );
66
 
        layout1->addWidget( descriptionEdit, 3, 1 );
 
72
        layout1->addWidget( descriptionLabel, 4, 0 );
 
73
        layout1->addWidget( descriptionEdit, 4, 1 );
67
74
 
68
75
        page2 = new QWidget( this );
69
76
        layout2 = new QGridLayout(page2);
190
197
        docInfo.setRelation(relationEdit->text());
191
198
        docInfo.setRights(rightsEdit->text());
192
199
        docInfo.setSource(sourceEdit->text());
 
200
        docInfo.setSubject(subjectEdit->text());
193
201
        docInfo.setTitle(titleEdit->text());
194
202
        docInfo.setType(typeEdit->text());
195
203
        return docInfo;
199
207
{
200
208
        titleEdit->setText(infos.getTitle());
201
209
        authorEdit->setText(infos.getAuthor());
 
210
        subjectEdit->setText(infos.getSubject());
202
211
        descriptionEdit->setPlainText(infos.getComments());
203
212
        keywordsEdit->setPlainText(infos.getKeywords());
204
213
        publisherEdit->setText(infos.getPublisher());