Add some support of hi-res displays

Karbovanets · Dec 20, 2021 · f242864 · f242864
1 parent 43f29f3
commit f242864
Show file tree

Hide file tree

Showing 75 changed files with 577 additions and 53 deletions.
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -191,13 +191,23 @@ void MainWindow::initUi() {
   statusBar()->addPermanentWidget(m_connectionStateIconLabel);
   statusBar()->addPermanentWidget(m_encryptionStateIconLabel);
   statusBar()->addPermanentWidget(m_synchronizationStateIconLabel);
-
+
+  m_synchronizationStateIconLabel->setFixedSize(16,16);
+  m_synchronizationStateIconLabel->setScaledContents( true );
+  m_connectionStateIconLabel->setFixedSize(16,16);
+  m_encryptionStateIconLabel->setFixedSize(16,16);
+  m_encryptionStateIconLabel->setScaledContents( true );
+  m_trackingModeIconLabel->setFixedSize(16,16);
+  m_trackingModeIconLabel->setScaledContents( true );
+  m_remoteModeIconLabel->setFixedSize(16,16);
+  m_remoteModeIconLabel->setScaledContents( true );
+
   m_ui->m_overviewAction->toggle();
   encryptedFlagChanged(false);
 
   qobject_cast<AnimatedLabel*>(m_synchronizationStateIconLabel)->setSprite(QPixmap(":icons/sync_sprite"), QSize(16, 16), 5, 24);
-  m_connectionStateIconLabel->setIcon(QPixmap(":icons/disconnected").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
-  m_trackingModeIconLabel->setPixmap(QPixmap(":icons/tracking").scaledToHeight(16, Qt::SmoothTransformation));
+  m_connectionStateIconLabel->setIcon(QPixmap(":icons/disconnected").scaled(96, 96, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+  m_trackingModeIconLabel->setPixmap(QPixmap(":icons/tracking").scaledToHeight(96, Qt::SmoothTransformation));
   m_remoteModeIconLabel->hide();
   m_trackingModeIconLabel->hide();
   m_trackingModeIconLabel->setToolTip(tr("Tracking wallet. Spending unavailable"));
@@ -206,7 +216,7 @@ void MainWindow::initUi() {
   QString connection = Settings::instance().getConnection();
   if(connection.compare("remote") == 0) {
     m_remoteModeIconLabel->show();
-    m_remoteModeIconLabel->setPixmap(QPixmap(":icons/remote_mode").scaledToHeight(16, Qt::SmoothTransformation));
+    m_remoteModeIconLabel->setPixmap(QPixmap(":icons/remote_mode").scaledToHeight(96, Qt::SmoothTransformation));
   }
 
   m_ui->m_showMnemonicSeedAction->setEnabled(false);
@@ -1105,7 +1115,7 @@ void MainWindow::encryptedFlagChanged(bool _encrypted) {
   m_ui->m_encryptWalletAction->setEnabled(!_encrypted);
   m_ui->m_changePasswordAction->setEnabled(_encrypted);
   QString encryptionIconPath = _encrypted ? ":icons/encrypted" : ":icons/decrypted";
-  QPixmap encryptionIcon = QPixmap(encryptionIconPath).scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+  QPixmap encryptionIcon = QPixmap(encryptionIconPath).scaled(96, 96, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
   m_encryptionStateIconLabel->setPixmap(encryptionIcon);
   QString encryptionLabelTooltip = _encrypted ? tr("Encrypted") : tr("Not encrypted");
   m_encryptionStateIconLabel->setToolTip(encryptionLabelTooltip);
@@ -1114,7 +1124,7 @@ void MainWindow::encryptedFlagChanged(bool _encrypted) {
 
 void MainWindow::peerCountUpdated(quint64 _peerCount) {
   QString connectionIconPath = _peerCount > 0 ? ":icons/connected" : ":icons/disconnected";
-  QPixmap connectionIcon = QPixmap(connectionIconPath).scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+  QPixmap connectionIcon = QPixmap(connectionIconPath).scaled(96, 96, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
   m_connectionStateIconLabel->setIcon(connectionIcon);
   m_connectionStateIconLabel->setToolTip(QString(tr("%n active connection(s)", "", _peerCount)));
 }
@@ -1139,7 +1149,7 @@ void MainWindow::walletSynchronizationInProgress(uint32_t _current, uint32_t _to
 }
 
 void MainWindow::walletSynchronized(int _error, const QString& _error_text) {
-  QPixmap syncIcon = QPixmap(":icons/synced").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+  QPixmap syncIcon = QPixmap(":icons/synced").scaled(96, 96, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
   qobject_cast<AnimatedLabel*>(m_synchronizationStateIconLabel)->stopAnimation();
   m_synchronizationStateIconLabel->setPixmap(syncIcon);
   QString syncLabelTooltip = _error > 0 ? tr("Not synchronized") : tr("Synchronized");

diff --git a/src/gui/TransactionsModel.cpp b/src/gui/TransactionsModel.cpp
@@ -374,9 +374,9 @@ QVariant TransactionsModel::getDecorationRole(const QModelIndex& _index) const {
     TransactionState transactionState = static_cast<TransactionState>(_index.data(ROLE_STATE).value<quint8>());
 
     if (transactionState != TransactionState::ACTIVE && transactionState != TransactionState::SENDING) {
-      return QPixmap(":icons/cancel");
+      return QPixmap(":icons/cancel").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
     } else if (numberOfConfirmations == 0) {
-      return QPixmap(":icons/unconfirmed");
+      return QPixmap(":icons/unconfirmed").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);;
     } else if(numberOfConfirmations < 2) {
       return QPixmap(":icons/clock1");
     } else if(numberOfConfirmations < 4) {
@@ -388,7 +388,7 @@ QVariant TransactionsModel::getDecorationRole(const QModelIndex& _index) const {
     } else if(numberOfConfirmations < 10) {
       return QPixmap(":icons/clock5");
     } else {
-      return QPixmap(":icons/transaction");
+      return QPixmap(":icons/transaction").scaled(16, 16, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);;
     }
   } else if (_index.column() == COLUMN_ADDRESS) {
     return _index.data(ROLE_ICON).value<QPixmap>().scaled(20, 20, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);

diff --git a/src/gui/ui/accountframe.ui b/src/gui/ui/accountframe.ui
@@ -110,7 +110,6 @@
        </property>
        <property name="font">
         <font>
-         <weight>50</weight>
          <bold>false</bold>
         </font>
        </property>
@@ -179,7 +178,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../resources.qrc">
-         <normaloff>:/icons/qrcode_white</normaloff>:/icons/qrcode_white</iconset>
+         <normaloff>:/icons/qrcode</normaloff>:/icons/qrcode</iconset>
        </property>
       </widget>
      </item>
@@ -254,7 +253,6 @@
         <property name="font">
          <font>
           <pointsize>8</pointsize>
-          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>
@@ -314,7 +312,6 @@
         <property name="font">
          <font>
           <pointsize>8</pointsize>
-          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>
@@ -374,7 +371,6 @@
         <property name="font">
          <font>
           <pointsize>8</pointsize>
-          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>
@@ -431,7 +427,6 @@
         <property name="font">
          <font>
           <pointsize>8</pointsize>
-          <weight>50</weight>
           <bold>false</bold>
          </font>
         </property>

diff --git a/src/gui/ui/receiveframe.ui b/src/gui/ui/receiveframe.ui
@@ -260,7 +260,7 @@
         </property>
         <property name="icon">
          <iconset resource="../../resources.qrc">
-          <normaloff>:/icons/btn-receive</normaloff>:/icons/btn-receive</iconset>
+          <normaloff>:/icons/qrcode</normaloff>:/icons/qrcode</iconset>
         </property>
        </widget>
       </item>

diff --git a/src/icons/add.png b/src/icons/add.png
diff --git a/src/icons/add.svg b/src/icons/add.svg
diff --git a/src/icons/add_recepient.png b/src/icons/add_recepient.png
diff --git a/src/icons/add_recepient.svg b/src/icons/add_recepient.svg
diff --git a/src/icons/address-book.png b/src/icons/address-book.png
diff --git a/src/icons/address-book.svg b/src/icons/address-book.svg
diff --git a/src/icons/broom.png b/src/icons/broom.png
diff --git a/src/icons/broom.svg b/src/icons/broom.svg
diff --git a/src/icons/cancel.png b/src/icons/cancel.png
diff --git a/src/icons/cancel.svg b/src/icons/cancel.svg
diff --git a/src/icons/coins.png b/src/icons/coins.png
diff --git a/src/icons/coins.svg b/src/icons/coins.svg
diff --git a/src/icons/connected.png b/src/icons/connected.png
diff --git a/src/icons/connected.svg b/src/icons/connected.svg
diff --git a/src/icons/copy.png b/src/icons/copy.png
diff --git a/src/icons/copy.svg b/src/icons/copy.svg
diff --git a/src/icons/disconnected.png b/src/icons/disconnected.png
diff --git a/src/icons/disconnected.svg b/src/icons/disconnected.svg
diff --git a/src/icons/edit.png b/src/icons/edit.png
diff --git a/src/icons/edit.svg b/src/icons/edit.svg
diff --git a/src/icons/editcopy.png b/src/icons/editcopy.png
diff --git a/src/icons/editpaste.png b/src/icons/editpaste.png
diff --git a/src/icons/export.png b/src/icons/export.png
diff --git a/src/icons/lock_closed.png b/src/icons/lock_closed.png
diff --git a/src/icons/lock_closed.svg b/src/icons/lock_closed.svg
diff --git a/src/icons/lock_open.png b/src/icons/lock_open.png
diff --git a/src/icons/lock_open.svg b/src/icons/lock_open.svg
diff --git a/src/icons/mining.png b/src/icons/mining.png
diff --git a/src/icons/mining.svg b/src/icons/mining.svg
diff --git a/src/icons/overview.png b/src/icons/overview.png
diff --git a/src/icons/overview.svg b/src/icons/overview.svg
diff --git a/src/icons/paste.png b/src/icons/paste.png
diff --git a/src/icons/paste.svg b/src/icons/paste.svg
diff --git a/src/icons/qrcode.png b/src/icons/qrcode.png