Browse Source

Changed font size for menu items and fixed small issue with news icons downloading

Ivan Arkhipov 6 years ago
parent
commit
2d91a5d373

+ 13 - 13
src/Legacy/widgets/mainwindow.cpp

@@ -134,25 +134,25 @@ MainWindow::~MainWindow()
     delete ui;
 }
 
-void MainWindow::on_menuentry_1_common_clicked()
+void MainWindow::on_menuentry_1_clicked()
 {
     hideAllContentWidgets();
     status_widget->show();
 }
 
-void MainWindow::on_menuentry_2_common_clicked()
+void MainWindow::on_menuentry_2_clicked()
 {
     hideAllContentWidgets();
     settings_widget->show();
 }
 
-void MainWindow::on_menuentry_3_common_clicked()
+void MainWindow::on_menuentry_3_clicked()
 {
     hideAllContentWidgets();
     rusification_widget->show();
 }
 
-void MainWindow::on_menuentry_4_common_clicked()
+void MainWindow::on_menuentry_4_clicked()
 {
     hideAllContentWidgets();
     help_widget->show();
@@ -187,12 +187,12 @@ void MainWindow::setupMenuHoverWidget()
     menuHoverWidget->setStyleSheet("background-color: rgba(55, 37, 31, 250);");
     menuHoverWidget->resize(0, 0);
 
-    connect(ui->menuentry_1_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_2_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_3_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
-    connect(ui->menuentry_4_common, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_1, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_2, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_3, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
+    connect(ui->menuentry_4, &MenuEntry::hover_label_changed, this, &MainWindow::onHoverMenuentry);
 
-    MenuEntry::setActiveLabel(ui->menuentry_1_common);
+    MenuEntry::setActiveLabel(ui->menuentry_1);
     menu_hover_checker_timer.setInterval(500);
     connect(&menu_hover_checker_timer, &QTimer::timeout, this, &MainWindow::checkMenuIsHovered);
     menu_hover_checker_timer.start();
@@ -215,10 +215,10 @@ void MainWindow::moveMenuHoverWidget(MenuEntry *target)
         menuHoverWidgetAnimation->start();
     }
 
-    ui->menuentry_1_common->raise();
-    ui->menuentry_2_common->raise();
-    ui->menuentry_3_common->raise();
-    ui->menuentry_4_common->raise();
+    ui->menuentry_1->raise();
+    ui->menuentry_2->raise();
+    ui->menuentry_3->raise();
+    ui->menuentry_4->raise();
 }
 
 void MainWindow::checkMenuIsHovered()

+ 5 - 4
src/Legacy/widgets/mainwindow.h

@@ -39,13 +39,13 @@ protected:
 private slots:
     void randomChangeBackground();
 
-    void on_menuentry_1_common_clicked();
+    void on_menuentry_1_clicked();
 
-    void on_menuentry_2_common_clicked();
+    void on_menuentry_2_clicked();
 
-    void on_menuentry_3_common_clicked();
+    void on_menuentry_3_clicked();
 
-    void on_menuentry_4_common_clicked();
+    void on_menuentry_4_clicked();
 
     void onHoverMenuentry();
 
@@ -90,6 +90,7 @@ private:
 
     const size_t small_font_size = 13;
     const size_t common_font_size = 14;
+    const size_t menuentry_font_size = 16;
     const size_t title_font_size = 17;
     const size_t supertitle_font_size = 32;
     const size_t bigbutton_font_size = 22;

+ 31 - 5
src/Legacy/widgets/mainwindow.ui

@@ -108,7 +108,7 @@
     <property name="styleSheet">
      <string notr="true">border-image:transparent;</string>
     </property>
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="6,7,13,6,0">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,6,7,13,6,0,0">
      <property name="spacing">
       <number>10</number>
      </property>
@@ -128,7 +128,20 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="MenuEntry" name="menuentry_1_common">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="MenuEntry" name="menuentry_1">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -176,7 +189,7 @@
       </widget>
      </item>
      <item>
-      <widget class="MenuEntry" name="menuentry_2_common">
+      <widget class="MenuEntry" name="menuentry_2">
        <property name="enabled">
         <bool>true</bool>
        </property>
@@ -212,7 +225,7 @@
       </widget>
      </item>
      <item>
-      <widget class="MenuEntry" name="menuentry_3_common">
+      <widget class="MenuEntry" name="menuentry_3">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -251,7 +264,7 @@
       </widget>
      </item>
      <item>
-      <widget class="MenuEntry" name="menuentry_4_common">
+      <widget class="MenuEntry" name="menuentry_4">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -292,6 +305,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QWidget" name="widget" native="true">
        <property name="sizePolicy">

+ 4 - 2
src/Legacy/widgets/newslistwidget.cpp

@@ -18,7 +18,7 @@ NewsListWidget::NewsListWidget(QWidget *parent) : QWidget(parent)
     connect(&news_update_timer, &QTimer::timeout, &news_downloader, &Downloader::start);
     connect(&news_downloader, &Downloader::downloadFinished, this, &NewsListWidget::updateNews);
     emit news_downloader.start();
-    news_update_timer.setInterval(1000 * 60); // 60 seconds;
+    news_update_timer.setInterval(1000 * 5); // 60 seconds;
     news_update_timer.start();
 }
 
@@ -57,9 +57,11 @@ void NewsListWidget::updateNews()
             img_dwnld.targetBytearray = &img;
             img_dwnld.start();
             img_dwnld.waitForDownloaded();
+            qDebug() << "Downloaded " << img_src;
             QPixmap img_pixmap;
             img_pixmap.loadFromData(img);
-            setImgToNewsPiece(i, img_pixmap);
+            QMetaObject::invokeMethod(this, "setImgToNewsPiece", Qt::QueuedConnection, Q_ARG(int, i), Q_ARG(QPixmap, img_pixmap));
+//            setImgToNewsPiece(i, img_pixmap);
         });
     }
 

+ 3 - 1
src/Legacy/widgets/newslistwidget.h

@@ -5,6 +5,7 @@
 #include <QVBoxLayout>
 #include "models/downloader.h"
 #include <QTimer>
+#include <QMutex>
 
 class NewsListWidget : public QWidget
 {
@@ -18,10 +19,11 @@ signals:
 
 public slots:
     void updateNews();
+private slots:
+    void setImgToNewsPiece(int piece_id, QPixmap img);
 
 private:
     void constructNewsPiece(int piece_id, QString title, QString text, QString news_src);
-    void setImgToNewsPiece(int piece_id, QPixmap img);
 
 private:
     QVBoxLayout* news_layout;