!2 remove about
From: @myshow2258 Reviewed-by: @dou33 Signed-off-by: @dou33
This commit is contained in:
commit
7d3b2eea63
36
0001-remove-about.patch
Normal file
36
0001-remove-about.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: indicator-china-weather
|
Name: indicator-china-weather
|
||||||
Version: 3.1.0
|
Version: 3.1.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: The weather data are from the heweather API s6 version.
|
Summary: The weather data are from the heweather API s6 version.
|
||||||
License: GPL-3.0+
|
License: GPL-3.0+
|
||||||
URL: https://github.com/UbuntuKylin/indicator-china-weather
|
URL: https://github.com/UbuntuKylin/indicator-china-weather
|
||||||
@ -21,6 +21,8 @@ BuildRequires: GeoIP-devel
|
|||||||
|
|
||||||
# Requires: NetworkManager
|
# Requires: NetworkManager
|
||||||
|
|
||||||
|
patch0: 0001-remove-about.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Indicator that displays China weather information
|
Indicator that displays China weather information
|
||||||
Kylin Weather displays detail weather information for one place,
|
Kylin Weather displays detail weather information for one place,
|
||||||
@ -29,6 +31,7 @@ BuildRequires: GeoIP-devel
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro
|
%{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro
|
||||||
@ -60,5 +63,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/man/man1/indicator-china-weather.1.gz
|
%{_datadir}/man/man1/indicator-china-weather.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 19 2021 lvhan <lvhan@kylinos.cn> - 3.1.0-2
|
||||||
|
- remove about
|
||||||
|
|
||||||
* Wed Dec 30 2020 lvhan <lvhan@kylinos.cn> - 3.1.0-1
|
* Wed Dec 30 2020 lvhan <lvhan@kylinos.cn> - 3.1.0-1
|
||||||
- update to upstream version 3.1.0-32
|
- update to upstream version 3.1.0-32
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user