← Back to branch summary

~ubuntu-branches/ubuntu/maverick/digikam/maverick

« back to all changes in this revision

Viewing changes to digikam/albumwidgetstack.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2009-03-17 23:07:56 UTC
  • mfrom: (1.2.20 upstream) (3.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20090317230756-db5b8rqjwb2j35e5
Tags: 2:0.10.0-1ubuntu1
* Remaining changes to Debian (committed to Debian SVN):
  - Depends: kde-icons-oxygen dropped (included through kdelibs)
  - Recommends: kipi-plugins added (provides major functionality)
  - debian/digikamthemedesigner.manpage: add missing manpage
* Remaning change to Debian:
  - Section: devel for -dbg package (no debug in Jaunty)

Show diffs side-by-side

added added

removed removed

Lines of Context:
digikam/albumwidgetstack.cpp
111
111
    d->splitter->setStretchFactor(0, 10);
112
112
    d->splitter->setStretchFactor(1, 2);
113
113
 
 
114
    // could fix bug 173746, see workaround in readSettings()
 
115
    int imagePreviewIndex = d->splitter->indexOf(d->imagePreviewView);
 
116
    int thumbbarIndex     = d->splitter->indexOf(d->thumbBar);
 
117
    d->splitter->setCollapsible(imagePreviewIndex, false);
 
118
    d->splitter->setCollapsible(thumbbarIndex,     false);
 
119
 
114
120
    d->welcomePageView  = new WelcomePageView(this);
115
121
    d->mediaPlayerView  = new MediaPlayerView(this);
116
122
 
194
200
        // in beta tester's config. Refuse to load.
195
201
        if (!state.startsWith("AAAA/wAAAAAAAAACAAAAAAAAAAA"))
196
202
            d->splitter->restoreState(QByteArray::fromBase64(state));
 
203
 
 
204
        // could fix bug 173746...
 
205
        AlbumSettings *settings = AlbumSettings::instance();
 
206
        bool showThumbbar = settings->getShowThumbbar();
 
207
        toggleShowBar(showThumbbar);
 
208
 
197
209
    }
198
210
}
199
211
 
200
212
void AlbumWidgetStack::saveSettings()
201
213
{
 
214
    // could fix bug 173746, see workaround in readSettings()
 
215
    // show thumbbar to get a valid splitter state
 
216
    toggleShowBar(true);
 
217
    d->splitter->refresh();
 
218
 
202
219
    if (d->everShowedSplitter)
203
220
    {
204
221
        KSharedConfig::Ptr config = KGlobal::config();