← Back to branch summary

~bstrong-f/fisysmgr/trunk

« back to all changes in this revision

Viewing changes to main/source/browsedlg.cpp

  • Committer: Barry Strong
  • Date: 2015-05-10 13:05:49 UTC
  • Revision ID: barry@softtechok.com-20150510130549-xlbzzt5slojawh70
Replaced password dialog with credentials dialog. Added minimal about box. Added change mout option value dialog. modified to compile with Qt4 or Qt5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/source/browsedlg.cpp
36
36
    FSList->setWordWrap(false);
37
37
    FSList->setCornerButtonEnabled(false);
38
38
    FSList->verticalHeader()->setVisible(false);
 
39
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
39
40
    FSList->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
 
41
#else
 
42
    FSList->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
 
43
#endif
40
44
    font = FSList->font();
41
45
    font.setFamily("Monospace");
42
46
    FSList->setFont(font);
58
62
    ui->pbApply->setIcon(QIcon::fromTheme("dialog-ok-apply", QIcon(":/icons/dialog-ok-apply.png")));
59
63
    ui->pbCancel->setIcon(QIcon::fromTheme("dialog-cancel", QIcon(":/icons/dialog-ok.png")));
60
64
    on_rbLocal_clicked();
61
 
    connect(FSList, SIGNAL(doubleClicked(QModelIndex)), SLOT(fslist_dblclicked()));
 
65
    connect(FSList, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(fslist_dblclicked()));
62
66
    connect(FSList, SIGNAL(currentItemChanged(const QModelIndex &, const QModelIndex &)),
63
67
            this, SLOT(currentItemChanged(const QModelIndex &, const QModelIndex &)));
64
68
}
108
112
    int         winWidth;
109
113
    int         winHeight;
110
114
    int         result;
111
 
    PassWordDlg passwrd(this);
112
 
    QString     wg;
 
115
    CredsDialog credsDialog;
113
116
 
114
117
    loading = true;
115
118
    setCursor(QCursor(Qt::WaitCursor));
118
121
        loadDisk();
119
122
    }
120
123
    if (ui->rbSamba->isChecked()) {
121
 
        winWidth = settings->value("PassWrdDialog/Width", 240).toInt();
122
 
        winHeight = settings->value("PassWrdDialog/Height", 180).toInt();
123
 
        wg = workgroup;
124
 
        passwrd.resize(winWidth, winHeight);
125
 
        result = passwrd.exec();
126
 
        if ((winWidth != passwrd.width()) || (winHeight != passwrd.height())) {
127
 
            settings->setValue("PassWrdDialog/Width", passwrd.width());
128
 
            settings->setValue("PassWrdDialog/Height", passwrd.height());
 
124
        winWidth = settings->value("CredsDialog/Width", 300).toInt();
 
125
        winHeight = settings->value("CredsDialog/Height", 200).toInt();
 
126
        credsDialog.resize(winWidth, winHeight);
 
127
        credsDialog.setValue(curCreds);
 
128
        result = credsDialog.exec();
 
129
        if ((winWidth != credsDialog.width()) || (winHeight != credsDialog.height())) {
 
130
            winWidth = credsDialog.width();
 
131
            winHeight = credsDialog.height();
 
132
            if (winWidth < 300)
 
133
                winWidth = 300;
 
134
            if (winHeight < 210)
 
135
                winHeight = 210;
 
136
            settings->setValue("CredsDialog/Width", winWidth);
 
137
            settings->setValue("CredsDialog/Height", winHeight);
129
138
        }
130
 
        if (wg != workgroup)
131
 
            settings->setValue("Samba/Workgroup", workgroup);
132
139
        if (result) {
 
140
            if (curCreds != credsDialog.value()) {
 
141
                curCreds = credsDialog.value();
 
142
                settings->setValue("CIFS/Credentials", curCreds);
 
143
            }
 
144
            workgroup = credsDialog.workgroup();
 
145
            username = credsDialog.username();
 
146
            password = credsDialog.password();
133
147
            ui->pbApply->setEnabled(false);
134
148
            loadSamba();
135
149
        }
144
158
 
145
159
void BrowseDlg::loadDisk() {
146
160
    if (! diskInfo.refresh()) {
147
 
        sPlayer->play("qrc:///sounds/Warning.mp3");
 
161
        sPlayer->play("qrc:///sounds/Warning.ogg");
148
162
        QMessageBox::critical(this,tr("FiSysMg - Message"), tr("Unable to load local disk information"));
149
163
        return;
150
164
    };
173
187
        }
174
188
    }
175
189
    if (fslModel->rowCount() > 0) {
 
190
        sortProxy.invalidate();
176
191
        sortProxy.setSortMode(local);
177
192
        sortProxy.sort(0);
178
193
        ui->pbApply->setEnabled(true);
219
234
        }
220
235
    }
221
236
    if (fslModel->rowCount() > 0) {
 
237
        sortProxy.invalidate();
222
238
        sortProxy.setSortMode(samba);
223
239
        sortProxy.sort(0);
224
240
    }