mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Minor wording and margin fixes.

Browse source
This commit is contained in:
Klaas Freitag 2013-08-15 11:30:39 +02:00
parent ee439382ed
commit b309d333a6
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mirall/folderstatusmodel.cpp
View file

@ -212,6 +212,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
int h = iconRect.bottom(); int h = iconRect.bottom();
if( !errorText.isEmpty() ) { if( !errorText.isEmpty() ) {
h += aliasMargin;
QRect errorRect = localPathRect; QRect errorRect = localPathRect;
errorRect.setLeft( iconRect.left()); errorRect.setLeft( iconRect.left());
errorRect.setTop( h ); errorRect.setTop( h );
@ -222,10 +223,6 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
painter->setPen( QColor(0xaa, 0xaa, 0xaa)); painter->setPen( QColor(0xaa, 0xaa, 0xaa));
painter->drawRoundedRect( errorRect, 4, 4 ); painter->drawRoundedRect( errorRect, 4, 4 );
QIcon warnIcon(":/mirall/resources/warning-16");
QPoint warnPos(errorRect.left()+aliasMargin/2, errorRect.top()+aliasMargin/2);
painter->drawPixmap( warnPos, warnIcon.pixmap(QSize(16,16)));
painter->setPen( Qt::white ); painter->setPen( Qt::white );
painter->setFont(errorFont); painter->setFont(errorFont);
QRect errorTextRect = errorRect; QRect errorTextRect = errorRect;

2
src/mirall/itemprogressdialog.cpp
View file

@ -40,7 +40,7 @@ ItemProgressDialog::ItemProgressDialog(Application*, QWidget *parent) :
this, SLOT(slotProgressErrors(const QString&, const Progress::SyncProblem&))); this, SLOT(slotProgressErrors(const QString&, const Progress::SyncProblem&)));
QStringList header; QStringList header;
header << tr("Folder/Time"); header << tr("Time");
header << tr("File"); header << tr("File");
header << tr("Folder"); header << tr("Folder");
header << tr("Action"); header << tr("Action");

2
src/mirall/settingsdialog.cpp
View file

@ -46,7 +46,7 @@ SettingsDialog::SettingsDialog(Application *app, QWidget *parent) :
_ui->setupUi(this); _ui->setupUi(this);
setObjectName("Settings"); // required as group for saveGeometry call setObjectName("Settings"); // required as group for saveGeometry call
setWindowTitle(tr("%1 Settings").arg(Theme::instance()->appNameGUI())); setWindowTitle(tr("%1").arg(Theme::instance()->appNameGUI()));
QIcon generalIcon(QLatin1String(":/mirall/resources/settings.png")); QIcon generalIcon(QLatin1String(":/mirall/resources/settings.png"));
QListWidgetItem *general = new QListWidgetItem(generalIcon, tr("General"), _ui->labelWidget); QListWidgetItem *general = new QListWidgetItem(generalIcon, tr("General"), _ui->labelWidget);