More polish and bugfixing

mirall.qrc

@@ -1,7 +1,6 @@
 <RCC>
     <qresource prefix="/new/mirall">
         <file>resources/ownCloud-32.png</file>
-        <file>resources/ownCloud-48.png</file>
         <file>resources/ownCloud-64.png</file>
         <file>resources/ownCloud-128.png</file>
         <file>resources/folder-grey-32.png</file>
@@ -9,5 +8,8 @@
         <file>resources/folder-grey-22.png</file>
         <file>resources/folder-remote-22.png</file>
         <file>resources/ownCloud-22.png</file>
+        <file>resources/ownCloud-48.png</file>
+        <file>resources/folder-grey-48.png</file>
+        <file>resources/folder-remote-48.png</file>
     </qresource>
 </RCC>

src/mirall/application.cpp

@@ -133,7 +133,7 @@ void Application::slotTrayClicked( QSystemTrayIcon::ActivationReason reason )
     } else {
       _statusDialog->setFolderList( _folderMap );
 
-      _statusDialog->exec();
+      _statusDialog->show();
     }
   }
 }

src/mirall/folderwizard.cpp

@@ -100,7 +100,7 @@ bool FolderWizardSourcePage::isComplete() const
     qDebug() << "Checking local alias: " << f->alias();
     if( f ) {
       if( f->alias() == alias ) {
-        warnString.append( tr("<br/>The alias <i>%1</i> is already in use. Please change it to something different.").arg(alias) );
+        warnString.append( tr("<br/>The alias <i>%1</i> is already in use. Please pick another alias.").arg(alias) );
         isOk = false;
         goon = false;
       }
@@ -390,6 +390,7 @@ FolderWizard::FolderWizard(QWidget *parent)
     setPage(Page_Target,   new FolderWizardTargetPage());
     // setPage(Page_Network,  new FolderWizardNetworkPage());
     // setPage(Page_Owncloud, new FolderWizardOwncloudPage());
+    setWindowTitle( tr( "Mirall Folder Wizard") );
 }
 
 void FolderWizard::setFolderMap( Folder::Map *fm)

src/mirall/sitecopyfolder.cpp

@@ -82,6 +82,7 @@ void SiteCopyFolder::fetchFromOC()
 {
   QMutexLocker locker( &_syncMutex );
   qDebug() << "starting to sync from ownCloud";
+  setSyncEnabled( true );
 
   startSiteCopy( "--fetch", Sync );
 }

src/mirall/statusdialog.cpp

@@ -52,7 +52,7 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
 
   painter->save();
 
-  QFont font = QApplication::font();
+  QFont font    = QApplication::font();
   QFont subFont = QApplication::font();
   //font.setPixelSize(font.weight()+);
   font.setBold(true);
@@ -65,7 +65,7 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
   QString pathText = qvariant_cast<QString>(index.data(FolderPathRole));
   QString statusText = qvariant_cast<QString>(index.data(FolderStatus));
 
-  QSize iconsize = icon.actualSize(option.decorationSize);
+  QSize iconsize(48,48); //  = icon.actualSize(option.decorationSize);
 
   QRect headerRect = option.rect;
   QRect subheaderRect = option.rect;
@@ -86,7 +86,7 @@ void FolderViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
   statusRect.setBottom( statusRect.top() + fmSub.height());
 
   //painter->drawPixmap(QPoint(iconRect.right()/2,iconRect.top()/2),icon.pixmap(iconsize.width(),iconsize.height()));
-  painter->drawPixmap(QPoint(iconRect.left()+iconsize.width()/2+2,iconRect.top()+iconsize.height()/2+3),icon.pixmap(iconsize.width(),iconsize.height()));
+  painter->drawPixmap(QPoint(iconRect.left()+15,iconRect.top()),icon.pixmap(iconsize.width(),iconsize.height()));
 
   painter->drawPixmap(QPoint(option.rect.right() - 4 - 48, option.rect.top() + 8 ), statusIcon.pixmap( 48,48));
 
@@ -107,16 +107,32 @@ StatusDialog::StatusDialog(QWidget *parent) :
     QDialog(parent)
 {
   setupUi( this  );
+  setWindowTitle( tr("Mirall Status") );
 
   _model = new QStandardItemModel();
   FolderViewDelegate *delegate = new FolderViewDelegate();
 
   _folderList->setItemDelegate( delegate );
   _folderList->setModel( _model );
+  _folderList->setMinimumWidth( 300 );
 
-  connect(_ButtonClose, SIGNAL(clicked()), this, SLOT(accept()));
+  connect(_ButtonClose,  SIGNAL(clicked()), this, SLOT(accept()));
   connect(_ButtonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveFolder()));
-  connect(_ButtonFetch, SIGNAL(clicked()), this, SLOT(slotFetchFolder()));
+  connect(_ButtonFetch,  SIGNAL(clicked()), this, SLOT(slotFetchFolder()));
+
+  _ButtonRemove->setEnabled(false);
+  _ButtonFetch->setEnabled(false);
+
+  connect(_folderList, SIGNAL(activated(QModelIndex)), SLOT(slotFolderActivated(QModelIndex)));
+}
+
+void StatusDialog::slotFolderActivated( const QModelIndex& indx )
+{
+  bool state = indx.isValid();
+
+  _ButtonRemove->setEnabled( state );
+  _ButtonFetch->setEnabled( state );
+
 }
 
 void StatusDialog::setFolderList( Folder::Map folders )
@@ -126,7 +142,8 @@ void StatusDialog::setFolderList( Folder::Map folders )
   foreach( Folder *f, folders ) {
     qDebug() << "Folder: " << f;
     QStandardItem *item = new QStandardItem();
-    item->setData( QIcon::fromTheme( "folder-sync" ), FolderViewDelegate::FolderIconRole );
+    QIcon icon = f->icon( 48 );
+    item->setData( icon, FolderViewDelegate::FolderIconRole );
     item->setData( f->path(),  FolderViewDelegate::FolderPathRole );
     item->setData( f->alias(),  FolderViewDelegate::FolderNameRole );
 

src/mirall/statusdialog.h

@@ -55,6 +55,7 @@ signals:
 public slots:
     void slotRemoveFolder();
     void slotFetchFolder();
+    void slotFolderActivated( const QModelIndex& );
 
 private:
     QStandardItemModel *_model;

src/mirall/statusdialog.ui

@@ -22,7 +22,7 @@
       </font>
      </property>
      <property name="text">
-      <string>Directory Sync Status</string>
+      <string>Directory Status</string>
      </property>
     </widget>
    </item>