Differential D26921 Diff 74421 svn/fileviewsvnplugin.cpp

Changeset View

Standalone View

View Options

svn/fileviewsvnplugin.cpp

Context not available.
37#include <QStringList> 37​#include <QStringList>
38#include <QTextStream> 38​#include <QTextStream>
39#include <QVBoxLayout> 39​#include <QVBoxLayout>
40​#include <QListWidget>
40#include <KConfigGroup> 41​#include <KConfigGroup>
41#include <KWindowConfig> 42​#include <KWindowConfig>
43​#include <QWindow>
44​#include <QTableWidget>
45​#include <QHeaderView>
42 46​
43K_PLUGIN_FACTORY(FileViewSvnPluginFactory, registerPlugin<FileViewSvnPlugin>();) 47​K_PLUGIN_FACTORY(FileViewSvnPluginFactory, registerPlugin<FileViewSvnPlugin>();)
44 48​
Context not available.
322 boxLayout->addWidget(new QLabel(i18nc("@label", "Description:"), 326​ boxLayout->addWidget(new QLabel(i18nc("@label", "Description:"),
323 &dialog)); 327​ &dialog));
324 QPlainTextEdit* editor = new QPlainTextEdit(&dialog); 328​ QPlainTextEdit* editor = new QPlainTextEdit(&dialog);
325 boxLayout->addWidget(editor); 329​ boxLayout->addWidget(editor, 1);
330​
331​ QFrame* line = new QFrame(&dialog);
332​ line->setFrameShape(QFrame::HLine);
333​ line->setFrameShadow(QFrame::Sunken);
334​ boxLayout->addWidget(line);
335​
336​ const QStringList header = { i18nc("@title:column", "Path"),
337​ i18nc("@title:column", "Status") };
338​ const int columnPath = 0;
339​ const int columnStatus = 1;
340​ QTableWidget *changes = new QTableWidget(m_versionInfoHash.size(), header.size(), &dialog);
341​ changes->setHorizontalHeaderLabels(header);
342​ changes->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
343​ changes->horizontalHeader()->setSectionResizeMode(columnStatus, QHeaderView::ResizeToContents);
344​ changes->verticalHeader()->setVisible(false);
345​ changes->setSortingEnabled(false);
346​
347​ QHash<QString, ItemVersion>::const_iterator it = m_versionInfoHash.cbegin();
348​ for ( int row = 0 ; it != m_versionInfoHash.cend(); ++it, ++row ) {
349​ QTableWidgetItem *path = new QTableWidgetItem( it.key() );
350​ QTableWidgetItem *status = new QTableWidgetItem;
351​
352​ path->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
353​ status->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable);
354​
355​ changes->setItem(row, columnPath, path);
356​ changes->setItem(row, columnStatus, status);
357​
358​ switch(it.value()) {
359​ case UnversionedVersion:
360​ status->setText( i18nc("@item:intable", "Unversioned") );
361​ break;
362​ case LocallyModifiedVersion:
363​ status->setText( i18nc("@item:intable", "Modified") );
364​ break;
365​ case AddedVersion:
366​ status->setText( i18nc("@item:intable", "Added") );
367​ break;
368​ case RemovedVersion:
369​ status->setText( i18nc("@item:intable", "Deleted") );
370​ break;
371​ case ConflictingVersion:
372​ status->setText( i18nc("@item:intable", "Conflict") );
373​ break;
374​ case MissingVersion:
375​ status->setText( i18nc("@item:intable", "Missing") );
376​ break;
377​ case UpdateRequiredVersion:
378​ status->setText( i18nc("@item:intable", "Update required") );
379​ break;
380​ default:
381​ // For SVN normaly we shouldn't be here with:
382​ // NormalVersion, LocallyModifiedUnstagedVersion, IgnoredVersion.
mevenUnsubmitted
Done

You probably can use Q_ASSERT

meven: You probably can use Q_ASSERT
nikolaikAuthorUnsubmitted
Done

We should be really careful with this asserts because there is no place documenting for example "There should be no NormalVersion". One can change beginRetrieval() and because we doesn't have test units for everything this could damage SVN plugin in some rare cases.
In my opinion better to continue working without plugin crash with empty status and qWarning() instead. It is also worth noting that commitFiles() can do its job anyway.

nikolaik: We should be really careful with this asserts because there is no place documenting for example…
mevenUnsubmitted
Done

I am fine with either solution.

meven: I am fine with either solution.
383​ // 'default' is for any future changes in ItemVersion enum.
384​
385​ qWarning() << "Unknown SVN status for item, ItemVersion =" << it.value();
mevenUnsubmitted
Done

Can we use some context here ?

meven: Can we use some context here ?
386​
387​ status->setText("");
388​ }
389​ }
390​ // Sort by status: unversioned is at the bottom.
391​ changes->sortByColumn(columnStatus, Qt::AscendingOrder);
392​ boxLayout->addWidget(changes, 3);
326 393​
327 dialog.setWindowTitle(i18nc("@title:window", "SVN Commit")); 394​ dialog.setWindowTitle(i18nc("@title:window", "SVN Commit"));
328 auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dialog); 395​ auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dialog);
329 connect(buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept); 396​ connect(buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
330 connect(buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject); 397​ connect(buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::reject);
331 auto okButton = buttonBox->button(QDialogButtonBox::Ok); 398​ auto okButton = buttonBox->button(QDialogButtonBox::Ok);
399​
332 okButton->setDefault(true); 400​ okButton->setDefault(true);
333 okButton->setText(i18nc("@action:button", "Commit")); 401​ okButton->setText(i18nc("@action:button", "Commit"));
334 boxLayout->addWidget(buttonBox); 402​ boxLayout->addWidget(buttonBox);
335 403​
336 KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), 404​ KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
337 "SvnCommitDialog"); 405​ "SvnCommitDialog");
406​ dialog.winId(); // Workaround for QTBUG-40584, line 1/2. See KWindowConfig::restoreWindowSize() docs.
338 KWindowConfig::restoreWindowSize(dialog.windowHandle(), dialogConfig); 407​ KWindowConfig::restoreWindowSize(dialog.windowHandle(), dialogConfig);
408​ dialog.resize(dialog.windowHandle()->size()); // Workaround for QTBUG-40584, line 2/2. See KWindowConfig::restoreWindowSize() docs.
339 409​
340 if (dialog.exec() == QDialog::Accepted) { 410​ if (dialog.exec() == QDialog::Accepted) {
341 // Write the commit description into a temporary file, so 411​ // Write the commit description into a temporary file, so
Context not available.