← Back to branch summary

~ubuntu-branches/ubuntu/maverick/scribus-ng/maverick-backports

« back to all changes in this revision

Viewing changes to scribus/pagelayout.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Oleksandr Moskalenko
  • Date: 2007-08-11 17:41:51 UTC
  • mfrom: (0.1.1 upstream) (4.1.2 feisty)
  • Revision ID: james.westby@ubuntu.com-20070811174151-tmkgjvjuc0mtk8ul
Tags: 1.3.4.dfsg+svn20071115-1
http://bugs.debian.org/447480
http://bugs.debian.org/448949
http://bugs.debian.org/427638
http://bugs.debian.org/449700
* Upstream svn update (Closes: #447480, #448949).
* debian/NEWS: Added a note for users wanting stable Scribus to switch to
  the "scribus" package (Closes: #427638).
* debian/watch: Updated the watch regex to properly track sourceforge
  releases for this branch (Closes: #449700).

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/pagelayout.cpp
41
41
                layoutsView->setAutoArrange( false );
42
42
                layoutsView->setSorting( false );
43
43
                layoutsView->setFocusPolicy(QWidget::NoFocus);
44
 
                layoutsView->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)7, 0, 0, layoutsView->sizePolicy().hasHeightForWidth() ) );
 
44
                layoutsView->setSizePolicy( QSizePolicy( QSizePolicy::Fixed, QSizePolicy::Ignored, 0, 0, layoutsView->sizePolicy().hasHeightForWidth() ) );
45
45
                layoutsView->setSelectionMode(QIconView::Single);
46
46
                layoutGroupLayout->addWidget( layoutsView );
47
47
        }
55
55
        firstPage = new ScComboBox( false, this, "firstPage" );
56
56
        layoutGroupLayout->addWidget( firstPage );
57
57
        languageChange();
 
58
        setMaximumWidth(minimumSizeHint().width());
58
59
        clearWState( WState_Polished );
59
60
        if (modus)
60
61
                connect(layoutsView, SIGNAL(clicked(QIconViewItem *)), this, SLOT(itemSelected(QIconViewItem* )));
72
73
        {
73
74
                QString psname=CommonStrings::translatePageSetString(pageSets[pg].Name);
74
75
                if (pg == 0)
75
 
                        layoutsCombo->insertItem(loadIcon("pagesingle16.png"), psname);
 
76
                        layoutsCombo->insertItem(loadIcon("16/page-simple.png"), psname);
76
77
                else if (pg == 1)
77
 
                        layoutsCombo->insertItem(loadIcon("pagedouble16.png"), psname);
 
78
                        layoutsCombo->insertItem(loadIcon("16/page-doublesided.png"), psname);
78
79
                else if (pg == 2)
79
 
                        layoutsCombo->insertItem(loadIcon("pagetriple16.png"), psname);
 
80
                        layoutsCombo->insertItem(loadIcon("16/page-3fold.png"), psname);
80
81
                else if (pg == 3)
81
 
                        layoutsCombo->insertItem(loadIcon("pagequadro16.png"), psname);
 
82
                        layoutsCombo->insertItem(loadIcon("16/page-4fold.png"), psname);
82
83
                else
83
 
                        layoutsCombo->insertItem(loadIcon("page16.png"), psname);
 
84
                        layoutsCombo->insertItem(loadIcon("16/page-simple.png"), psname);
84
85
        }
85
86
        connect(layoutsCombo, SIGNAL(activated(int)), this, SLOT(itemSelected(int)));
86
87
}
185
186
 
186
187
void PageLayouts::languageChange()
187
188
{
188
 
        setTitle( tr( "Page Layout" ) );
 
189
        setTitle( tr( "Document Layout" ) );
189
190
        if (modus)
190
191
        {
191
192
                layoutsView->clear();
193
194
                {
194
195
                        QString psname=CommonStrings::translatePageSetString(pageSets[pg].Name);
195
196
                        if (pg == 0)
196
 
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("pagesingle.png") );
 
197
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("32/page-simple.png") );
197
198
                        else if (pg == 1)
198
 
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("pagedouble.png") );
 
199
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("32/page-doublesided.png") );
199
200
                        else if (pg == 2)
200
 
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("pagetriple.png") );
 
201
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("32/page-3fold.png") );
201
202
                        else if (pg == 3)
202
 
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("pagequadro.png") );
 
203
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("32/page-4fold.png") );
203
204
                        else
204
 
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("page.png") );
 
205
                                (void) new QIconViewItem( layoutsView, psname, loadIcon("32/page-simple.png") );
205
206
                }
206
207
                int maxWidth = 0;
207
208
                QIconViewItem* ic = layoutsView->firstItem();
233
234
                {
234
235
                        QString psname=CommonStrings::translatePageSetString(pageSets[pg].Name);
235
236
                        if (pg == 0)
236
 
                                layoutsCombo->insertItem(loadIcon("pagesingle16.png"), psname);
 
237
                                layoutsCombo->insertItem(loadIcon("16/page-simple.png"), psname);
237
238
                        else if (pg == 1)
238
 
                                layoutsCombo->insertItem(loadIcon("pagedouble16.png"), psname);
 
239
                                layoutsCombo->insertItem(loadIcon("16/page-doublesided.png"), psname);
239
240
                        else if (pg == 2)
240
 
                                layoutsCombo->insertItem(loadIcon("pagetriple16.png"), psname);
 
241
                                layoutsCombo->insertItem(loadIcon("16/page-3fold.png"), psname);
241
242
                        else if (pg == 3)
242
 
                                layoutsCombo->insertItem(loadIcon("pagequadro16.png"), psname);
 
243
                                layoutsCombo->insertItem(loadIcon("16/page-4fold.png"), psname);
243
244
                        else
244
 
                                layoutsCombo->insertItem(loadIcon("page16.png"), psname);
 
245
                                layoutsCombo->insertItem(loadIcon("16/page-simple.png"), psname);
245
246
                }
246
247
                layoutsCombo->setCurrentItem(currIndex);
247
248
                connect(layoutsCombo, SIGNAL(activated(int)), this, SLOT(itemSelected(int)));