mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-24 05:55:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug in the conflict resolution screen. I accidentally selected

Browse source 
the wrong table when I made the change to allow multiple accounts.

Minor GUI enhancements on the conflict resolution screen.
This commit is contained in:
Juan Carlos Cornejo 2011-11-09 14:10:55 -05:00 committed by Klaas Freitag
parent a9ba915972
commit 0e004ec570
2 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
SyncWindow.cpp
View file

@ -416,7 +416,7 @@ OwnCloudSync* SyncWindow::getAccount(QString name)
void SyncWindow::on_buttonBox_accepted()
{
bool allConflictsResolved = true;
for( int row = 0; row < ui->tableAccounts->rowCount(); row++ ) {
for( int row = 0; row < ui->tableConflict->rowCount(); row++ ) {
QComboBox *combo = (QComboBox*)ui->tableConflict->cellWidget(row,4);
if( combo->currentIndex() == 0 ) {
allConflictsResolved = false;
@ -432,28 +432,6 @@ void SyncWindow::on_buttonBox_accepted()
updateStatus();
}
ui->stackedWidget->setCurrentIndex(0);
/*
// Check the selections are valid
//mSyncTimer->start(mUpdateTime);
mFileAccessBusy = true;
for( int row = 0; row < ui->tableConflict->rowCount(); row++ ) {
QComboBox *combo = (QComboBox*)ui->tableConflict->cellWidget(row,3);
if( combo->currentIndex() == 0 ) {
allConflictsResolved = false;
continue;
}
processFileConflict(ui->tableConflict->takeItem(row,0)->text(),
combo->currentText());
//qDebug() << ui->tableConflict->takeItem(row,0)->text()
// << combo->currentIndex();
}
if( allConflictsResolved) {
ui->conflict->setEnabled(false);
mConflictsExist = false;
}
mFileAccessBusy = false;
*/
}
void SyncWindow::on_buttonBox_rejected()

39
SyncWindow.ui
View file

@ -21,7 +21,7 @@
<number>0</number>
</property>
<property name="currentIndex">
<number>2</number>
<number>1</number>
</property>
<widget class="QWidget" name="page">
<layout class="QGridLayout" name="gridLayout_2">
@ -125,21 +125,14 @@
</widget>
<widget class="QWidget" name="page_2">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Select the one files that should be used, either the server version or local version:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QTableWidget" name="tableConflict">
<property name="columnCount">
<number>5</number>
@ -171,6 +164,32 @@
</column>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Select the one files that should be used, either the server version or local version:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="font">
<font>
<pointsize>19</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
<underline>false</underline>
</font>
</property>
<property name="text">
<string>CONFLICT RESOLUTION</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">