← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to krita/ui/widgets/kis_filter_selector_widget.cc

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/ui/widgets/kis_filter_selector_widget.cc
49
49
    KisBookmarkedFilterConfigurationsModel* currentBookmarkedFilterConfigurationsModel;
50
50
    KisFiltersModel* filtersModel;
51
51
    QGridLayout *widgetLayout;
 
52
    bool visibleSelector;
52
53
};
53
54
 
54
55
KisFilterSelectorWidget::KisFilterSelectorWidget(QWidget* parent) : d(new Private)
76
77
 
77
78
    d->widgetLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum), 1, 0, 0, 2);
78
79
    d->widgetLayout->addItem(new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), 0, 1, 2, 1);
 
80
    
 
81
    d->visibleSelector = true;
79
82
}
80
83
 
81
84
KisFilterSelectorWidget::~KisFilterSelectorWidget()
82
85
{
83
 
    KisConfig cfg;
84
 
    QList<int> sizes = d->uiFilterSelector.splitter->sizes();
85
 
    cfg.setShowFilterGallery(sizes[0] > 0);
86
86
    delete d->filtersModel;
 
87
    delete d->currentBookmarkedFilterConfigurationsModel;
87
88
    delete d->currentCentralWidget;
88
89
    delete d->widgetLayout;
89
90
    delete d;
105
106
    d->image = _image;
106
107
}
107
108
 
108
 
void KisFilterSelectorWidget::showSelector(bool visible)
 
109
void KisFilterSelectorWidget::showFilterGallery(bool visible)
109
110
{
110
111
    QList<int> sizes;
 
112
    int currentCentralWidgetWidth = d->currentCentralWidget ? d->currentCentralWidget->width() : 0;
111
113
    if (visible) {
112
 
        sizes << 200;
 
114
        sizes << d->uiFilterSelector.filtersSelector->sizeHint().width() << currentCentralWidgetWidth;
113
115
    } else {
114
 
        sizes << 0;
 
116
        sizes << 0 << currentCentralWidgetWidth;
115
117
    }
116
118
    d->uiFilterSelector.splitter->setSizes(sizes);
 
119
    d->visibleSelector = visible;
 
120
}
 
121
 
 
122
bool KisFilterSelectorWidget::isFilterGalleryVisible() const
 
123
{
 
124
    return d->uiFilterSelector.splitter->sizes()[0] > 0;
117
125
}
118
126
 
119
127
void KisFilterSelectorWidget::setFilter(KisFilterSP f)
155
163
    d->currentCentralWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
156
164
    d->widgetLayout->addWidget(d->currentCentralWidget, 0 , 0);
157
165
 
158
 
    KisConfig cfg;
159
 
    QList<int> sizes;
160
 
    if (cfg.showFilterGallery()) {
161
 
 
162
 
        sizes << d->uiFilterSelector.filtersSelector->sizeHint().width()
163
 
        << d->currentCentralWidget->sizeHint().width();
164
 
    } else {
165
 
        sizes << 0 << d->currentCentralWidget->sizeHint().width();
166
 
    }
167
 
    d->uiFilterSelector.splitter->setSizes(sizes);
168
 
 
 
166
    showFilterGallery(d->visibleSelector);
169
167
}
170
168
 
171
169
void KisFilterSelectorWidget::setFilterIndex(const QModelIndex& idx)