update to uptream version 3.1.3

This commit is contained in:
tanyulong2021 2022-03-03 11:15:33 +08:00
parent 7d3b2eea63
commit 9dc9408569
4 changed files with 5 additions and 40 deletions

View File

@ -1,36 +0,0 @@
From b480fa946aa57d43e5dc7ff9776c53f025c2054f Mon Sep 17 00:00:00 2001
From: lvhan <lvhan@kylinos.cn>
Date: Tue, 19 Jan 2021 16:39:53 +0800
Subject: [PATCH] remove about
---
src/mainwindow.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f9e9027..d1ebd40 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -70,7 +70,8 @@ MainWindow::MainWindow(QWidget *parent) :
addCityAction = new AddCityAction(menu);
addCityAction->setText(tr("Add City"));
aboutAction = new QAction(tr("About"),menu);
- actions<<addCityAction<<aboutAction;
+// actions<<addCityAction<<aboutAction;
+ actions<<addCityAction;
menu->addActions(actions);
setBtn->setMenu(menu);
connect(addCityAction, &AddCityAction::requestSetCityName, this, [=] (QString cityName) {
@@ -214,7 +215,8 @@ void MainWindow::initControlQss()
setBtn->setFixedSize(30,30);
//menu跟主题走
- menu->setFixedSize(120,66);
+// menu->setFixedSize(120,66);
+ menu->setFixedSize(120,40);
menu->setStyleSheet("QMenu{border-radius:3px;background-color:white;color:black;}"
"QMenu::item:selected {color:white;background-color: #2dabf9;}"
"QMenu::item {font-size:14px;border-radius:4px;background-color: transparent;}");
--
2.29.2.windows.2

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: indicator-china-weather
Version: 3.1.0
Release: 2
Version: 3.1.3
Release: 1
Summary: The weather data are from the heweather API s6 version.
License: GPL-3.0+
URL: https://github.com/UbuntuKylin/indicator-china-weather
@ -21,7 +21,6 @@ BuildRequires: GeoIP-devel
# Requires: NetworkManager
patch0: 0001-remove-about.patch
%description
Indicator that displays China weather information
@ -31,7 +30,6 @@ patch0: 0001-remove-about.patch
%prep
%setup -q
%patch0 -p1
%build
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro
@ -63,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/man/man1/indicator-china-weather.1.gz
%changelog
* Thu Mar 03 2022 tanyulong <tanyulong@kylinos.cn> - 3.1.3-1
- update to uptream version 3.1.3
* Tue Jan 19 2021 lvhan <lvhan@kylinos.cn> - 3.1.0-2
- remove about