← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/scrpalettebase.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/scrpalettebase.cpp
33
33
#include "prefsmanager.h"
34
34
#include "prefsfile.h"
35
35
#include "prefscontext.h"
 
36
#include "util.h"
36
37
 
37
38
 
38
39
ScrPaletteBase::ScrPaletteBase(  QWidget * parent, const char * name, bool modal, WFlags f) : QDialog ( parent, name, modal, f | Qt::WStyle_Customize | Qt::WStyle_Tool | Qt::WStyle_Title | Qt::WStyle_MinMax | Qt::WStyle_SysMenu | Qt::WStyle_NormalBorder),
40
41
prefsContextName(QString::null),
41
42
visibleOnStartup(false)
42
43
{
 
44
        originalParent=parent;
 
45
        tempParent=0;
 
46
        setIcon(loadIcon("AppIcon.png"));
43
47
        setPrefsContext(name);
44
 
        ScribusMainWindow *scapp = dynamic_cast<ScribusMainWindow*>(parent);
45
 
        if (scapp)
46
 
                connect(scapp, SIGNAL(prefsChanged()), this, SLOT(setFontSize()));
 
48
        connect(PrefsManager::instance(), SIGNAL(prefsChanged()), this, SLOT(setFontSize()));
47
49
}
48
50
 
49
51
void ScrPaletteBase::setPrefsContext(QString context)
64
66
 
65
67
void ScrPaletteBase::startup()
66
68
{
 
69
        setFontSize();
67
70
        setShown(visibleOnStartup);
68
71
        emit paletteShown(visibleOnStartup);
69
72
}
72
75
{
73
76
        storeVisibility(visible);
74
77
        setShown(visible);
 
78
        setActiveWindow();
75
79
}
76
80
 
77
 
void ScrPaletteBase::setFontSize() {
78
 
        QFont *newfont = new QFont(font());
79
 
        newfont->setPointSize(PrefsManager::instance()->appPrefs.PaletteFontSize);
80
 
        setFont(*newfont);
 
81
void ScrPaletteBase::setFontSize()
 
82
{
 
83
        QFont newfont(font());
 
84
        newfont.setPointSize(PrefsManager::instance()->appPrefs.PaletteFontSize);
 
85
        setFont(newfont);
81
86
}
82
87
 
83
88
/*
122
127
 
123
128
void ScrPaletteBase::show()
124
129
{
125
 
        QDialog::show();
126
130
        if (palettePrefs)
127
131
        {
128
132
                QDesktopWidget *d = QApplication::desktop();
159
163
                                vheight = QMAX( gStrut.height(), scr.height() - vtop );
160
164
//                      qDebug(QString("root %1x%2 %7 palette %3x%4 @ (%5,%6)").arg(d->width()).arg(d->height())
161
165
//                              .arg(vwidth).arg(vheight).arg(vleft).arg(vtop).arg(name()));
162
 
                        setGeometry(vleft, vtop, vwidth, vheight);
 
166
//                      setGeometry(vleft, vtop, vwidth, vheight);
 
167
                        resize(vwidth, vheight);
 
168
                        move(vleft, vtop);
163
169
                }
164
170
                storeVisibility(true);
165
171
        }
 
172
        QDialog::show();
166
173
}
167
174
 
168
175
void ScrPaletteBase::hide()
185
192
{
186
193
        if (palettePrefs)
187
194
        {
188
 
                QRect geo = geometry();
 
195
                QRect geo = frameGeometry();
189
196
                palettePrefs->set("left", geo.left());
190
197
                palettePrefs->set("top", geo.top());
191
198
        }
214
221
        if (palettePrefs)
215
222
                palettePrefs->set("visible", vis);
216
223
}
 
224
 
 
225
int ScrPaletteBase::exec(QWidget* newParent)
 
226
{
 
227
        Q_ASSERT(tempParent==0 && newParent!=0);
 
228
        tempParent=newParent;
 
229
        int wflags=getWFlags();
 
230
        reparent(newParent, wflags , QPoint(0,0), false);
 
231
        int i=QDialog::exec();
 
232
        reparent(originalParent, wflags , QPoint(0,0), false);
 
233
        tempParent=0;
 
234
        return i;
 
235
}