From 8241657bc8433f4a3d2206b45239fecfcfd7abfd Mon Sep 17 00:00:00 2001 From: peijiankang Date: Tue, 28 Jun 2022 09:47:51 +0800 Subject: [PATCH] Increase the drag bar of forecast part --- 0004-update-translation-file.patch | 2 +- ...crease-the-drag-bar-of-forecast-part.patch | 51 +++++++++++++++++++ indicator-china-weather.spec | 7 ++- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 0005-Increase-the-drag-bar-of-forecast-part.patch diff --git a/0004-update-translation-file.patch b/0004-update-translation-file.patch index 499da8c..9ed98fe 100644 --- a/0004-update-translation-file.patch +++ b/0004-update-translation-file.patch @@ -36,7 +36,7 @@ index 21773d4..335d3c9 100644 - ui->lbCityCollect->setText("收藏城市"); - ui->lbCityCurrent->setText("当前城市"); + ui->lbCityCollect->setText(tr("Collections")); //收藏城市 -+ ui->lbCityCurrent->setText((tr("Local")); //当前城市 ++ ui->lbCityCurrent->setText(tr("Local")); //当前城市 ui->lbCityCount->setText("0/8"); m_citynumber = 0; diff --git a/0005-Increase-the-drag-bar-of-forecast-part.patch b/0005-Increase-the-drag-bar-of-forecast-part.patch new file mode 100644 index 0000000..dd2809b --- /dev/null +++ b/0005-Increase-the-drag-bar-of-forecast-part.patch @@ -0,0 +1,51 @@ +From 1c7c1137638b494da26ee419afa7a7074fafe301 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Tue, 28 Jun 2022 09:46:12 +0800 +Subject: [PATCH] Increase the drag bar of forecast part + +--- + debian/changelog | 1 + + src/mainwindow.cpp | 2 +- + translations/generate_translations_pm.sh | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/debian/changelog b/debian/changelog +index 7b4b0f7..a18e2f5 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,6 +1,7 @@ + indicator-china-weather (3.1.0-37) v101; urgency=medium + + * 解决了BUG#30685 程序没有IP定位功能 ++ * 解决了BUG#27090 收藏界面国际化问题 + + -- shixiaoshuo Fri,8 Jan 2021 10:33:00 +0800 + +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp +index eb4c764..4b6ab78 100644 +--- a/src/mainwindow.cpp ++++ b/src/mainwindow.cpp +@@ -264,7 +264,7 @@ void MainWindow::initControlQss() + m_scrollarea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_scrollarea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + +- m_scrollarea->verticalScrollBar()->setStyleSheet("QScrollBar:vertical{margin:0px 2px 0px 2px;width:10px;background:rgba(255,255,255,0);border-radius:6px;}" ++ m_scrollarea->verticalScrollBar()->setStyleSheet("QScrollBar:vertical{margin:0px 2px 0px 2px;width:13px;background:rgba(255,255,255,0);border-radius:6px;}" + "QScrollBar::up-arrow:vertical{height:0px;}" + "QScrollBar::sub-line:vertical{border:0px solid;height:0px}" + "QScrollBar::sub-page:vertical{background:transparent;}" +diff --git a/translations/generate_translations_pm.sh b/translations/generate_translations_pm.sh +index 2359710..2170239 100755 +--- a/translations/generate_translations_pm.sh ++++ b/translations/generate_translations_pm.sh +@@ -1,6 +1,6 @@ + #! /bin/bash + +-ts_file_list=(`ls translations/*.ts`) ++ts_file_list=(`ls ./*.ts`) + + for ts in "${ts_file_list[@]}" + do +-- +2.33.0 + diff --git a/indicator-china-weather.spec b/indicator-china-weather.spec index a65b5bb..87028d9 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: 11 +Release: 12 Summary: The weather data are from the heweather API s6 version. License: GPL-3.0+ URL: https://github.com/UbuntuKylin/indicator-china-weather @@ -26,6 +26,7 @@ patch1: fix-auto-get-location.patch patch2: 0002-Modified-kylin-weather-display-is-incomplete.patch patch3: 0003-add-X-UKUI-AutoRestart-filed-in-desktop.patch patch4: 0004-update-translation-file.patch +patch5: 0005-Increase-the-drag-bar-of-forecast-part.patch %description Indicator that displays China weather information @@ -40,6 +41,7 @@ patch4: 0004-update-translation-file.patch %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{qmake_qt5} %{_qt5_qmake_flags} CONFIG+=enable-by-default indicator-china-weather.pro @@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/man/man1/indicator-china-weather.1.gz %changelog +* Tue Jun 28 2022 peijiankang - 3.1.0-12 +- Increase the drag bar of forecast part + * Mon Jun 27 2022 peijiankang - 3.1.0-11 - update translation file