Klaas Freitag 12 лет назад
Родитель
Сommit
df5ef6fe67

+ 1 - 1
src/mirall/folderman.cpp

@@ -579,7 +579,7 @@ QString FolderMan::statusToString( SyncResult syncStatus, bool enabled ) const
     case SyncResult::Error:
         break;
     case SyncResult::Problem:
-        folderMessage = tr( "Last Sync was successful, but with problems on individual files.");
+        folderMessage = tr( "Last Sync was successful, but with warnings on individual files.");
         break;
     case SyncResult::SetupError:
         folderMessage = tr( "Setup Error." );

+ 5 - 1
src/mirall/itemprogressdialog.cpp

@@ -98,6 +98,9 @@ void ItemProgressDialog::setSyncResultStatus(const SyncResult& result )
     case SyncResult::SetupError:
         folderMessage = tr( "Setup Error." );
         break;
+    case SyncResult::Problem:
+        folderMessage = tr( "Sync success, but warnings on individual files.");
+        break;
     default:
         folderMessage = tr( "Undefined Error State." );
     }
@@ -265,7 +268,7 @@ void ItemProgressDialog::decorateFolderItem( const QString& folder )
     folderItem->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Success));
   } else {
     // FIXME: Set a soft error icon here.
-    folderItem->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Error));
+    folderItem->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem));
   }
 }
 
@@ -275,6 +278,7 @@ QTreeWidgetItem *ItemProgressDialog::createFolderItem(const QString& folder)
     strings.append(folder);
     QTreeWidgetItem *item = new QTreeWidgetItem( _ui->_treeWidget, strings );
     item->setFirstColumnSpanned(true);
+    item->setExpanded(true);
     return item;
 }
 

+ 3 - 1
src/mirall/theme.cpp

@@ -227,9 +227,11 @@ QIcon Theme::syncStateIcon( SyncResult::Status status, bool sysTray ) const
         statusIcon = QLatin1String("state-ok");
         break;
     case SyncResult::Problem:
-        statusIcon = QLatin1String("state-error");  // FIXME: Use state-problem once we have an icon.
+        statusIcon = QLatin1String("state-information");
+        break;
     case SyncResult::Error:
     case SyncResult::SetupError:
+        statusIcon = QLatin1String("state-error");  // FIXME: Use state-problem once we have an icon.
     default:
         statusIcon = QLatin1String("state-error");
     }

+ 6 - 0
theme.qrc

@@ -5,31 +5,37 @@
         <file>theme/colored/state-ok-32.png</file>
         <file>theme/colored/state-offline-32.png</file>
         <file>theme/colored/state-error-32.png</file>
+        <file>theme/colored/state-information-32.png</file>
         <file>theme/black/state-sync-32.png</file>
         <file>theme/black/state-pause-32.png</file>
         <file>theme/black/state-ok-32.png</file>
         <file>theme/black/state-offline-32.png</file>
         <file>theme/black/state-error-32.png</file>
+        <file>theme/black/state-information-32.png</file>
         <file>theme/white/state-sync-32.png</file>
         <file>theme/white/state-pause-32.png</file>
         <file>theme/white/state-ok-32.png</file>
         <file>theme/white/state-offline-32.png</file>
         <file>theme/white/state-error-32.png</file>
+        <file>theme/white/state-information-32.png</file>
         <file>theme/colored/state-sync-64.png</file>
         <file>theme/colored/state-pause-64.png</file>
         <file>theme/colored/state-ok-64.png</file>
         <file>theme/colored/state-offline-64.png</file>
         <file>theme/colored/state-error-64.png</file>
+        <file>theme/colored/state-information-64.png</file>
         <file>theme/black/state-sync-64.png</file>
         <file>theme/black/state-pause-64.png</file>
         <file>theme/black/state-ok-64.png</file>
         <file>theme/black/state-offline-64.png</file>
         <file>theme/black/state-error-64.png</file>
+        <file>theme/black/state-information-64.png</file>
         <file>theme/white/state-sync-64.png</file>
         <file>theme/white/state-pause-64.png</file>
         <file>theme/white/state-ok-64.png</file>
         <file>theme/white/state-offline-64.png</file>
         <file>theme/white/state-error-64.png</file>
+        <file>theme/white/state-information-64.png</file>
         <file>theme/colored/owncloud-icon-22.png</file>
         <file>theme/colored/owncloud-icon-32.png</file>
         <file>theme/colored/owncloud-icon-48.png</file>

BIN
theme/black/state-information-16.png


BIN
theme/black/state-information-32.png


BIN
theme/black/state-information-64.png


BIN
theme/colored/state-information-16.png


BIN
theme/colored/state-information-32.png


BIN
theme/colored/state-information-64.png


BIN
theme/white/state-information-16.png


BIN
theme/white/state-information-32.png


BIN
theme/white/state-information-64.png