admin/qbreak
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- translations updated + scripts fixed

Browse Source
This commit is contained in:
Dmytro Bogovych 2022-05-07 21:59:47 +03:00
parent fed6086c4a
commit 18ac04ec18
9 changed files with 130 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/aboutdlg.cpp
View File

@ -7,6 +7,7 @@ AboutDlg::AboutDlg(QWidget *parent) :
ui(new Ui::AboutDlg) ui(new Ui::AboutDlg)
{ {
ui->setupUi(this); ui->setupUi(this);
ui->mAppIcon->setPixmap(QPixmap(":/assets/images/coffee_cup/icon_96x96")); ui->mAppIcon->setPixmap(QPixmap(":/assets/images/coffee_cup/icon_96x96"));
auto version_text = QString("Version %1.%2.%3") auto version_text = QString("Version %1.%2.%3")
.arg(QBREAK_VERSION_MAJOR) .arg(QBREAK_VERSION_MAJOR)

2
app/aboutdlg.ui
View File

@ -23,7 +23,7 @@
</size> </size>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>About</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>

48
app/strings.ts
View File

@ -5,8 +5,8 @@
<name>AboutDlg</name> <name>AboutDlg</name>
<message> <message>
<location filename="aboutdlg.ui" line="26"/> <location filename="aboutdlg.ui" line="26"/>
<source>Dialog</source> <source>About</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="aboutdlg.ui" line="32"/> <location filename="aboutdlg.ui" line="32"/>
@ -37,52 +37,52 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="159"/> <location filename="mainwindow.ui" line="181"/>
<source>Skip this break</source> <source>Skip this break</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="235"/> <location filename="mainwindow.cpp" line="228"/>
<source>Start next break</source> <source>Start next break</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="238"/> <location filename="mainwindow.cpp" line="231"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="241"/> <location filename="mainwindow.cpp" line="234"/>
<source>About</source> <source>About</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="244"/> <location filename="mainwindow.cpp" line="237"/>
<source>Exit</source> <source>Exit</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="272"/> <location filename="mainwindow.cpp" line="265"/>
<source>Less than a minute left until the next break.</source> <source>Less than a minute left until the next break.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="274"/> <location filename="mainwindow.cpp" line="267"/>
<source>There are %1 minutes left until the next break.</source> <source>There are %1 minutes left until the next break.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="283"/> <location filename="mainwindow.cpp" line="276"/>
<source>New break</source> <source>New break</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="284"/> <location filename="mainwindow.cpp" line="277"/>
<source>New break will start in %1 secs</source> <source>New break will start in %1 secs</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="293"/> <location filename="mainwindow.cpp" line="286"/>
<source>Postpone for </source> <source>Postpone for </source>
<translation></translation> <translation></translation>
</message> </message>
@ -90,12 +90,12 @@
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="mainwindow.cpp" line="225"/> <location filename="mainwindow.cpp" line="218"/>
<source>%1 seconds</source> <source>%1 seconds</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="227"/> <location filename="mainwindow.cpp" line="220"/>
<source>%1 minutes</source> <source>%1 minutes</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -137,5 +137,25 @@
<source>Preferred monitor</source> <source>Preferred monitor</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="settingsdialog.ui" line="120"/>
<source>Audio to play when break finish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="settingsdialog.ui" line="134"/>
<source>Command to run when break finish</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="settingsdialog.cpp" line="104"/>
<source>Select audio file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="settingsdialog.cpp" line="104"/>
<source>Sound files(*.wav *.mp3 *.ogg)</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
</TS> </TS>

48
app/strings_en.ts
View File

@ -5,8 +5,8 @@
<name>AboutDlg</name> <name>AboutDlg</name>
<message> <message>
<location filename="aboutdlg.ui" line="26"/> <location filename="aboutdlg.ui" line="26"/>
<source>Dialog</source> <source>About</source>
<translation></translation> <translation>About</translation>
</message> </message>
<message> <message>
<location filename="aboutdlg.ui" line="32"/> <location filename="aboutdlg.ui" line="32"/>
@ -37,52 +37,52 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="159"/> <location filename="mainwindow.ui" line="181"/>
<source>Skip this break</source> <source>Skip this break</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="235"/> <location filename="mainwindow.cpp" line="228"/>
<source>Start next break</source> <source>Start next break</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="238"/> <location filename="mainwindow.cpp" line="231"/>
<source>Settings</source> <source>Settings</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="241"/> <location filename="mainwindow.cpp" line="234"/>
<source>About</source> <source>About</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="244"/> <location filename="mainwindow.cpp" line="237"/>
<source>Exit</source> <source>Exit</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="272"/> <location filename="mainwindow.cpp" line="265"/>
<source>Less than a minute left until the next break.</source> <source>Less than a minute left until the next break.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="274"/> <location filename="mainwindow.cpp" line="267"/>
<source>There are %1 minutes left until the next break.</source> <source>There are %1 minutes left until the next break.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="283"/> <location filename="mainwindow.cpp" line="276"/>
<source>New break</source> <source>New break</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="284"/> <location filename="mainwindow.cpp" line="277"/>
<source>New break will start in %1 secs</source> <source>New break will start in %1 secs</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="293"/> <location filename="mainwindow.cpp" line="286"/>
<source>Postpone for </source> <source>Postpone for </source>
<translation></translation> <translation></translation>
</message> </message>
@ -90,12 +90,12 @@
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="mainwindow.cpp" line="225"/> <location filename="mainwindow.cpp" line="218"/>
<source>%1 seconds</source> <source>%1 seconds</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="227"/> <location filename="mainwindow.cpp" line="220"/>
<source>%1 minutes</source> <source>%1 minutes</source>
<translation></translation> <translation></translation>
</message> </message>
@ -137,5 +137,25 @@
<source>Preferred monitor</source> <source>Preferred monitor</source>
<translation></translation> <translation></translation>
</message> </message>
<message>
<location filename="settingsdialog.ui" line="120"/>
<source>Audio to play when break finish</source>
<translation>Audio to play when break finish</translation>
</message>
<message>
<location filename="settingsdialog.ui" line="134"/>
<source>Command to run when break finish</source>
<translation>Command to run when break finish</translation>
</message>
<message>
<location filename="settingsdialog.cpp" line="104"/>
<source>Select audio file</source>
<translation>Select audio file</translation>
</message>
<message>
<location filename="settingsdialog.cpp" line="104"/>
<source>Sound files(*.wav *.mp3 *.ogg)</source>
<translation>Sound files(*.wav *.mp3 *.ogg)</translation>
</message>
</context> </context>
</TS> </TS>

50
app/strings_ru.ts
View File

@ -4,8 +4,12 @@
<context> <context>
<name>AboutDlg</name> <name>AboutDlg</name>
<message> <message>
<location filename="aboutdlg.ui" line="26"/>
<source>Dialog</source> <source>Dialog</source>
<translation type="vanished">О программе</translation>
</message>
<message>
<location filename="aboutdlg.ui" line="26"/>
<source>About</source>
<translation>О программе</translation> <translation>О программе</translation>
</message> </message>
<message> <message>
@ -37,52 +41,52 @@
<translation>QBreak</translation> <translation>QBreak</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.ui" line="159"/> <location filename="mainwindow.ui" line="181"/>
<source>Skip this break</source> <source>Skip this break</source>
<translation>Пропустить</translation> <translation>Пропустить</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="235"/> <location filename="mainwindow.cpp" line="228"/>
<source>Start next break</source> <source>Start next break</source>
<translation>Начать перерыв</translation> <translation>Начать перерыв</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="238"/> <location filename="mainwindow.cpp" line="231"/>
<source>Settings</source> <source>Settings</source>
<translation>Настройки</translation> <translation>Настройки</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="241"/> <location filename="mainwindow.cpp" line="234"/>
<source>About</source> <source>About</source>
<translation>О программе</translation> <translation>О программе</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="244"/> <location filename="mainwindow.cpp" line="237"/>
<source>Exit</source> <source>Exit</source>
<translation>Выход</translation> <translation>Выход</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="272"/> <location filename="mainwindow.cpp" line="265"/>
<source>Less than a minute left until the next break.</source> <source>Less than a minute left until the next break.</source>
<translation>До перерыва осталось меньше минуты.</translation> <translation>До перерыва осталось меньше минуты.</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="274"/> <location filename="mainwindow.cpp" line="267"/>
<source>There are %1 minutes left until the next break.</source> <source>There are %1 minutes left until the next break.</source>
<translation>Осталось %1 минут до перерыва.</translation> <translation>Осталось %1 минут до перерыва.</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="283"/> <location filename="mainwindow.cpp" line="276"/>
<source>New break</source> <source>New break</source>
<translation>Скоро перерыв</translation> <translation>Скоро перерыв</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="284"/> <location filename="mainwindow.cpp" line="277"/>
<source>New break will start in %1 secs</source> <source>New break will start in %1 secs</source>
<translation>Перерыв начнется через %1 секунд.</translation> <translation>Перерыв начнется через %1 секунд.</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="293"/> <location filename="mainwindow.cpp" line="286"/>
<source>Postpone for </source> <source>Postpone for </source>
<translation>Отложить на</translation> <translation>Отложить на</translation>
</message> </message>
@ -90,12 +94,12 @@
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="mainwindow.cpp" line="225"/> <location filename="mainwindow.cpp" line="218"/>
<source>%1 seconds</source> <source>%1 seconds</source>
<translation>%1 секунд</translation> <translation>%1 секунд</translation>
</message> </message>
<message> <message>
<location filename="mainwindow.cpp" line="227"/> <location filename="mainwindow.cpp" line="220"/>
<source>%1 minutes</source> <source>%1 minutes</source>
<translation>%1 минут</translation> <translation>%1 минут</translation>
</message> </message>
@ -137,6 +141,16 @@
<source>Preferred monitor</source> <source>Preferred monitor</source>
<translation>Предпочитаемый монитор</translation> <translation>Предпочитаемый монитор</translation>
</message> </message>
<message>
<location filename="settingsdialog.ui" line="120"/>
<source>Audio to play when break finish</source>
<translation>Проигрывать по окончанию перерыва</translation>
</message>
<message>
<location filename="settingsdialog.ui" line="134"/>
<source>Command to run when break finish</source>
<translation>Запускать по окончанию перерыва</translation>
</message>
<message> <message>
<source>Break interval (seconds)</source> <source>Break interval (seconds)</source>
<translation type="vanished">Промежуток между перерывами в секундах</translation> <translation type="vanished">Промежуток между перерывами в секундах</translation>
@ -149,5 +163,15 @@
<source>Postpone time (seconds)</source> <source>Postpone time (seconds)</source>
<translation type="vanished">На сколько можно отложить перерыв (в секундах)</translation> <translation type="vanished">На сколько можно отложить перерыв (в секундах)</translation>
</message> </message>
<message>
<location filename="settingsdialog.cpp" line="104"/>
<source>Select audio file</source>
<translation>Выбрать аудиозапись</translation>
</message>
<message>
<location filename="settingsdialog.cpp" line="104"/>
<source>Sound files(*.wav *.mp3 *.ogg)</source>
<translation>Аудио файлы (*.wav *.mp3 *.ogg)</translation>
</message>
</context> </context>
</TS> </TS>

11
scripts/build_linux.sh
View File

@ -1,5 +1,12 @@
#export QTDIR=/home/$USER/qt/5.12.10/gcc_64 #!/bin/bash
export QTDIR=/home/$USER/qt5/5.12.12/gcc_64
# I use this script on two different hosts so there are logic to find proper Qt installation
export QT_HOME=/home/$USER/qt/5.12.10/gcc_64
if [ ! -d "$QT_HOME" ] ; then
export QT_HOME=/home/$USER/qt5/5.12.12/gcc_64
fi
# Build .appimage
/usr/bin/python3 build_qbreak.py /usr/bin/python3 build_qbreak.py

14
scripts/build_qbreak.py
View File

@ -13,8 +13,8 @@ EXIT_OK = 0
EXIT_ERROR = 1 EXIT_ERROR = 1
# Check if Qt is specified # Check if Qt is specified
if not 'QTDIR' in os.environ: if not 'QT_HOME' in os.environ:
print('Qt location must be set in QTDIR environment variable.') print('Qt location must be set in QT_HOME environment variable.')
exit(1) exit(1)
# Prepare build directory # Prepare build directory
@ -28,6 +28,10 @@ version_suffix = build_utils.get_version(app_source / 'config.h', 'QBREAK_VERSIO
version_minor = build_utils.get_version(app_source / 'config.h', 'QBREAK_VERSION_MINOR') version_minor = build_utils.get_version(app_source / 'config.h', 'QBREAK_VERSION_MINOR')
version_major = build_utils.get_version(app_source / 'config.h', 'QBREAK_VERSION_MAJOR') version_major = build_utils.get_version(app_source / 'config.h', 'QBREAK_VERSION_MAJOR')
if version_major is None or version_minor is None or version_suffix is None:
print('App version is not found, exiting.')
exit(EXIT_OK)
app_version = f'{version_major}.{version_minor}.{version_suffix}' app_version = f'{version_major}.{version_minor}.{version_suffix}'
print (f'Found QBreak version: {app_version}') print (f'Found QBreak version: {app_version}')
@ -37,7 +41,9 @@ os.chdir(build_dir)
if platform.system() == 'Linux': if platform.system() == 'Linux':
print('Linux detected') print('Linux detected')
print('Configure...') print('Configure...')
retcode = os.system('qmake ../../app')
qmake_path = Path(os.environ['QT_HOME']) / 'bin' / 'qmake'
retcode = os.system(f'{qmake_path} ../../app')
if retcode != 0: if retcode != 0:
print(f'qmake call failed with code {retcode}') print(f'qmake call failed with code {retcode}')
exit(retcode) exit(retcode)
@ -69,7 +75,7 @@ if platform.system() == 'Linux':
'-always-overwrite', '-always-overwrite',
'-verbose=2', '-verbose=2',
'-appimage', '-appimage',
'-qmake=' + os.environ['QTDIR'] + '/bin/qmake', '-qmake=' + os.environ['QT_HOME'] + '/bin/qmake',
'-unsupported-allow-new-glibc', '-unsupported-allow-new-glibc',
#'-no-translations', #'-no-translations',
'-extra-plugins=iconengines,platformthemes/libqgtk3.so' '-extra-plugins=iconengines,platformthemes/libqgtk3.so'

2
scripts/build_utils.py
View File

@ -80,7 +80,7 @@ def get_version(path, name):
with codecs.open(path, mode='r', encoding='utf-8') as f: with codecs.open(path, mode='r', encoding='utf-8') as f:
t = f.read() t = f.read()
pattern = r"#define " + name + r" (?P<number>[\d]+)" pattern = r"#define " + name + r"[\s]+(?P<number>[\d]+)"
m = re.search(pattern=pattern, string=t, flags=re.MULTILINE) m = re.search(pattern=pattern, string=t, flags=re.MULTILINE)
if m is not None: if m is not None:
return m.group("number") return m.group("number")