← Back to branch summary

~pkgcrosswire/bibletime/main

« back to all changes in this revision

Viewing changes to src/frontend/displaywindow/cwritewindow.cpp

  • Committer: Jonathan Marsden
  • Date: 2011-12-23 20:32:12 UTC
  • Revision ID: jmarsden@fastmail.fm-20111223203212-1g3e35rlhbys07iu
New upstream version 2.9.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/frontend/displaywindow/cwritewindow.cpp
23
23
CWriteWindow::CWriteWindow(QList<CSwordModuleInfo*> modules, CMDIArea* parent)
24
24
        : CDisplayWindow(modules, parent), m_writeDisplay(0) {}
25
25
 
26
 
CWriteWindow::~CWriteWindow() {}
27
 
 
28
 
 
29
26
void CWriteWindow::insertKeyboardActions( BtActionCollection* const ) {}
30
27
 
31
28
void CWriteWindow::initConnections() {
38
35
 
39
36
void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
40
37
 
41
 
    settings->setWriteWindowType( writeWindowType() );
42
 
 
43
 
    QRect rect;
44
 
    rect.setX(parentWidget()->x());
45
 
    rect.setY(parentWidget()->y());
46
 
    rect.setWidth(parentWidget()->width());
47
 
    rect.setHeight(parentWidget()->height());
48
 
    settings->setGeometry(rect);
 
38
    settings->writeWindowType = writeWindowType();
 
39
    settings->windowGeometry.setRect(parentWidget()->x(),
 
40
                                     parentWidget()->y(),
 
41
                                     parentWidget()->width(),
 
42
                                     parentWidget()->height());
49
43
 
50
44
    // settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
51
 
    settings->setType(modules().first()->type());
52
 
    settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
 
45
    settings->type = modules().first()->type();
 
46
    settings->maximized = isMaximized() || parentWidget()->isMaximized();
53
47
 
54
48
    if (key()) {
55
49
        sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
58
52
            oldLang = QString::fromLatin1(vk->getLocale());
59
53
            vk->setLocale("en"); //save english locale names as default!
60
54
        }
61
 
        settings->setKey( key()->key() );
 
55
        settings->key = key()->key();
62
56
        if (vk) {
63
57
            vk->setLocale(oldLang.toLatin1());
64
58
        }
68
62
    Q_FOREACH(const CSwordModuleInfo *m, modules()) {
69
63
        mods.append(m->name());
70
64
    }
71
 
    settings->setModules(mods);
 
65
    settings->modules = mods;
72
66
}
73
67
 
74
68
void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
75
69
    setUpdatesEnabled(false);
76
70
 
77
 
    if (settings->maximized()) {
 
71
    if (settings->maximized) {
78
72
        parentWidget()->showMaximized();
79
73
    }
80
74
    else {
81
 
        const QRect rect = settings->geometry();
 
75
        const QRect &rect = settings->windowGeometry;
82
76
        parentWidget()->resize(rect.width(), rect.height());
83
77
        parentWidget()->move(rect.x(), rect.y());
84
78
        //setGeometry( settings->geometry() );