From 42ea6faa2e02a6fab409365a399ced194485d8c2 Mon Sep 17 00:00:00 2001 From: lvhan Date: Tue, 19 Jan 2021 16:43:37 +0800 Subject: [PATCH] remove about --- 0001-remove-about.patch | 36 ++++++++++++++++++++++++++++++++++++ indicator-china-weather.spec | 8 +++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-remove-about.patch diff --git a/0001-remove-about.patch b/0001-remove-about.patch new file mode 100644 index 0000000..47e3099 --- /dev/null +++ b/0001-remove-about.patch @@ -0,0 +1,36 @@ +From b480fa946aa57d43e5dc7ff9776c53f025c2054f Mon Sep 17 00:00:00 2001 +From: lvhan +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<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 + diff --git a/indicator-china-weather.spec b/indicator-china-weather.spec index 995b400..029b4d8 100644 --- a/indicator-china-weather.spec +++ b/indicator-china-weather.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: indicator-china-weather Version: 3.1.0 -Release: 1 +Release: 2 Summary: The weather data are from the heweather API s6 version. License: GPL-3.0+ URL: https://github.com/UbuntuKylin/indicator-china-weather @@ -21,6 +21,8 @@ BuildRequires: GeoIP-devel # Requires: NetworkManager +patch0: 0001-remove-about.patch + %description Indicator that displays China weather information Kylin Weather displays detail weather information for one place, @@ -29,6 +31,7 @@ BuildRequires: GeoIP-devel %prep %setup -q +%patch0 -p1 %build %{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 %changelog +* Tue Jan 19 2021 lvhan - 3.1.0-2 +- remove about + * Wed Dec 30 2020 lvhan - 3.1.0-1 - update to upstream version 3.1.0-32