blue/squawk
blue
/
squawk
2
3
Fork 6
Code Issues 21 Pull Requests 2 Actions Releases 10 Wiki Activity

an attempt to make a first Archlinux package

This commit is contained in:
Blue 2019-10-07 18:35:55 +03:00
parent 9baadad332
commit 0d026ad343
11 changed files with 55 additions and 607 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -2,11 +2,14 @@ cmake_minimum_required(VERSION 3.0)
project(squawk)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
include(GNUInstallDirs)
find_package(Qt5Widgets CONFIG REQUIRED)
find_package(Qt5LinguistTools)
@ -30,7 +33,12 @@ target_link_libraries(squawk Qt5::Widgets)
add_subdirectory(ui)
add_subdirectory(core)
add_subdirectory(external/qxmpp)
option(SYSTEM_QXMPP "Use system qxmpp lib" OFF)
if(NOT SYSTEM_QXMPP)
add_subdirectory(external/qxmpp)
endif()
target_link_libraries(squawk squawkUI)
target_link_libraries(squawk squawkCORE)
@ -39,5 +47,5 @@ target_link_libraries(squawk uuid)
add_dependencies(${CMAKE_PROJECT_NAME} translations)
# Install the executable
install(TARGETS squawk DESTINATION bin)
install(FILES ${QM_FILES} DESTINATION share/l10n)
install(TARGETS squawk DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/Macaw/Squawk/l10n)

11
core/CMakeLists.txt
View File

@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.0)
project(squawkCORE)
# Instruct CMake to run moc automatically when needed.
set (CMAKE_CXX_STANDARD 17)
set(CMAKE_AUTOMOC ON)
find_package(Qt5Widgets CONFIG REQUIRED)
@ -22,11 +21,15 @@ set(squawkCORE_SRC
# Tell CMake to create the helloworld executable
add_library(squawkCORE ${squawkCORE_SRC})
if(SYSTEM_QXMPP)
find_package(QXmpp CONFIG REQUIRED)
get_target_property(QXMPP_INTERFACE_INCLUDE_DIRECTORIES QXmpp::QXmpp INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(squawkCORE PUBLIC ${QXMPP_INTERFACE_INCLUDE_DIRECTORIES})
endif()
# Use the Widgets module from Qt 5.
target_link_libraries(squawkCORE Qt5::Core)
target_link_libraries(squawkCORE Qt5::Network)
target_link_libraries(squawkCORE qxmpp)
target_link_libraries(squawkCORE lmdb)
# Install the executable
install(TARGETS squawkCORE DESTINATION lib)

16
main.cpp
View File

@ -25,6 +25,7 @@
#include <QSettings>
#include <QTranslator>
#include <QLibraryInfo>
#include <QStandardPaths>
int main(int argc, char *argv[])
{
@ -38,14 +39,25 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName("Macaw");
QCoreApplication::setOrganizationDomain("macaw.me");
QCoreApplication::setApplicationName("Squawk");
QCoreApplication::setApplicationVersion("0.0.4");
QCoreApplication::setApplicationVersion("0.0.5");
QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app.installTranslator(&qtTranslator);
QTranslator myappTranslator;
myappTranslator.load(QLocale(), QLatin1String("squawk"), ".");
QStringList shares = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
bool found = false;
for (QString share : shares) {
found = myappTranslator.load(QLocale(), QLatin1String("squawk"), ".", share + "/l10n");
if (found) {
break;
}
}
if (!found) {
myappTranslator.load(QLocale(), QLatin1String("squawk"), ".", QCoreApplication::applicationDirPath());
}
app.installTranslator(&myappTranslator);
QIcon icon;

21
packaging/Archlinux/PKGBUILD Normal file
View File

@ -0,0 +1,21 @@
# Maintainer: Yury Gubich <blue@macaw.me>
pkgname=squawk-git
pkgver=0.0.5
pkgrel=1
pkgdesc="An XMPP desktop messenger, written on qt"
arch=('i686' 'x86_64')
url="https://git.macaw.me/blue/squawk"
license=('GPLv3')
depends=('qt5-base' 'qt5-svg' 'lmdb' 'qxmpp>=1.0.0' 'libutil-linux')
makedepends=('cmake')
source=("https://git.macaw.me/blue/squawk/archive/master.tar.gz")
md5sums=('SKIP')
build() {
cd "$srcdir/squawk"
cmake . -D SYSTEM_QXMPP:BOOL=True -D CMAKE_INSTALL_PREFIX=/usr -G Ninja
cmake --build .
}
package() {
cd "$srcdir/squawk"
DESTDIR="$pkgdir/" cmake --build . --target install
}

283
translations/main.ts
View File

@ -1,283 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1">
<context>
<name>Account</name>
<message>
<location filename="ui/widgets/account.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="127"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="40"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="129"/>
<source>Your account login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="47"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="131"/>
<source>Server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="54"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="133"/>
<source>A server address of your account. Like 404.city or macaw.me</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="61"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="135"/>
<source>Login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="68"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="136"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="75"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="138"/>
<source>Password of your account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="94"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="142"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="101"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="144"/>
<source>Just a name how would you call this account, doesn&apos;t affect anything</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="108"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="146"/>
<source>Resource</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="115"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="148"/>
<source>A resource name like &quot;Home&quot; or &quot;Work&quot;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="118"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="150"/>
<source>QXmpp</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Accounts</name>
<message>
<location filename="ui/widgets/accounts.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="108"/>
<source>Accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="45"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="109"/>
<source>Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="86"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="110"/>
<source>Add</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="96"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="111"/>
<source>Edit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="106"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="112"/>
<source>Change password</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="129"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="113"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>JoinConference</name>
<message>
<location filename="ui/widgets/joinconference.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="116"/>
<source>Join new conference</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="22"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="117"/>
<source>JID</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="29"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="119"/>
<source>Room JID</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="32"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="121"/>
<source>identifier@conference.server.org</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="39"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="122"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="49"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="123"/>
<source>Join on login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="56"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="125"/>
<source>If checked Squawk will try to join this conference on login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="66"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="128"/>
<source>Nick name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="73"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="130"/>
<source>Your nick name for that conference. If you leave this field empty your account name will be used as a nick name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="76"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="132"/>
<source>John</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NewContact</name>
<message>
<location filename="ui/widgets/newcontact.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="103"/>
<source>Add new contact</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="22"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="104"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="29"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="106"/>
<source>An account that is going to have new contact</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="36"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="108"/>
<source>JID</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="43"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="110"/>
<source>Jabber id of your new contact</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="46"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="112"/>
<source>name@server.dmn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="53"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="113"/>
<source>Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="60"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="115"/>
<source>The way this new contact will be labeled in your roster (optional)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="63"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="117"/>
<source>John Smith</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Squawk</name>
<message>
<location filename="ui/squawk.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="130"/>
<source>squawk</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/squawk.ui" line="75"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="136"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/squawk.ui" line="81"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="137"/>
<source>Squawk</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/squawk.ui" line="96"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="131"/>
<source>Accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/squawk.ui" line="105"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="132"/>
<source>Quit</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/squawk.ui" line="117"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="133"/>
<source>Add contact</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/squawk.ui" line="128"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="134"/>
<source>Add conference</source>
<translation type="unfinished"></translation>
</message>
</context>
</TS>

BIN
translations/main_ru.qm
View File

Binary file not shown.

22
translations/main_ru.qph
View File

@ -1,22 +0,0 @@
<!DOCTYPE QPH>
<QPH language="ru_RU">
<phrase>
<source>Add contact</source>
<target>Добавить контакт</target>
<definition>Opens add contact dialog</definition>
</phrase>
<phrase>
<source>Add conference</source>
<target>Присоединиться к беседе</target>
<definition>Opens a dialog to join conference</definition>
</phrase>
<phrase>
<source>Quit</source>
<target>Выйти</target>
<definition>Quits the application</definition>
</phrase>
<phrase>
<source>Account</source>
<target>Учетная запись</target>
</phrase>
</QPH>

288
translations/main_ru.ts
View File

@ -1,288 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="ru_RU">
<context>
<name>Account</name>
<message>
<location filename="ui/widgets/account.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="127"/>
<source>Account</source>
<translatorcomment>Заголовок окна</translatorcomment>
<translation>Учетная запись</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="40"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="129"/>
<source>Your account login</source>
<translation>Имя пользователя Вашей учетной записи</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="47"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="131"/>
<source>Server</source>
<translation>Сервер</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="54"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="133"/>
<source>A server address of your account. Like 404.city or macaw.me</source>
<translation>Адресс сервера вашей учетной записи (выглядит как 404.city или macaw.me)</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="61"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="135"/>
<source>Login</source>
<translation>Имя учетной записи</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="68"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="136"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="75"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="138"/>
<source>Password of your account</source>
<translation>Пароль вашей учетной записи</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="94"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="142"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="101"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="144"/>
<source>Just a name how would you call this account, doesn&apos;t affect anything</source>
<translation>Просто имя, то как Вы называете свою учетную запись, может быть любым</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="108"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="146"/>
<source>Resource</source>
<translation>Ресурс</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="115"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="148"/>
<source>A resource name like &quot;Home&quot; or &quot;Work&quot;</source>
<translation>Имя этой программы для ваших контактов, может быть &quot;Home&quot; или &quot;Phone&quot;</translation>
</message>
<message>
<location filename="ui/widgets/account.ui" line="118"/>
<location filename="build/ui/squawkUI_autogen/include/ui_account.h" line="150"/>
<source>QXmpp</source>
<translatorcomment>Ресурс по умолчанию</translatorcomment>
<translation>QXmpp</translation>
</message>
</context>
<context>
<name>Accounts</name>
<message>
<location filename="ui/widgets/accounts.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="108"/>
<source>Accounts</source>
<translation>Учетные записи</translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="45"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="109"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="86"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="110"/>
<source>Add</source>
<translation>Добавить</translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="96"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="111"/>
<source>Edit</source>
<translation>Редактировать</translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="106"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="112"/>
<source>Change password</source>
<translation>Изменить пароль</translation>
</message>
<message>
<location filename="ui/widgets/accounts.ui" line="129"/>
<location filename="build/ui/squawkUI_autogen/include/ui_accounts.h" line="113"/>
<source>Connect</source>
<translation>Подключить</translation>
</message>
</context>
<context>
<name>JoinConference</name>
<message>
<location filename="ui/widgets/joinconference.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="116"/>
<source>Join new conference</source>
<translatorcomment>Заголовок окна</translatorcomment>
<translation type="unfinished">Присоединиться к новой беседе</translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="22"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="117"/>
<source>JID</source>
<translation>JID</translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="29"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="119"/>
<source>Room JID</source>
<translation type="unfinished">Jabber-идентификатор беседы</translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="32"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="121"/>
<source>identifier@conference.server.org</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="39"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="122"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="49"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="123"/>
<source>Join on login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="56"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="125"/>
<source>If checked Squawk will try to join this conference on login</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="66"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="128"/>
<source>Nick name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="73"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="130"/>
<source>Your nick name for that conference. If you leave this field empty your account name will be used as a nick name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="ui/widgets/joinconference.ui" line="76"/>
<location filename="build/ui/squawkUI_autogen/include/ui_joinconference.h" line="132"/>
<source>John</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NewContact</name>
<message>
<location filename="ui/widgets/newcontact.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="103"/>
<source>Add new contact</source>
<translatorcomment>Заголовок окна</translatorcomment>
<translation>Добавление нового контакта</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="22"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="104"/>
<source>Account</source>
<translation>Учетная запись</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="29"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="106"/>
<source>An account that is going to have new contact</source>
<translation>Учетная запись для которой будет добавлен контакт</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="36"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="108"/>
<source>JID</source>
<translation>JID</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="43"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="110"/>
<source>Jabber id of your new contact</source>
<translation>Jabber-идентификатор нового контакта</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="46"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="112"/>
<source>name@server.dmn</source>
<translatorcomment>Placeholder поля ввода JID</translatorcomment>
<translation>name@server.dmn</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="53"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="113"/>
<source>Name</source>
<translation>Имя</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="60"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="115"/>
<source>The way this new contact will be labeled in your roster (optional)</source>
<translation>То, как будет подписан контакт в вашем списке контактов (не обязательно)</translation>
</message>
<message>
<location filename="ui/widgets/newcontact.ui" line="63"/>
<location filename="build/ui/squawkUI_autogen/include/ui_newcontact.h" line="117"/>
<source>John Smith</source>
<translation>Иван Иванов</translation>
</message>
</context>
<context>
<name>Squawk</name>
<message>
<location filename="ui/squawk.ui" line="14"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="130"/>
<source>squawk</source>
<translation>Squawk</translation>
</message>
<message>
<location filename="ui/squawk.ui" line="75"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="136"/>
<source>Settings</source>
<translation>Настройки</translation>
</message>
<message>
<location filename="ui/squawk.ui" line="81"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="137"/>
<source>Squawk</source>
<translation>Squawk</translation>
</message>
<message>
<location filename="ui/squawk.ui" line="96"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="131"/>
<source>Accounts</source>
<translation>Учетные записи</translation>
</message>
<message>
<location filename="ui/squawk.ui" line="105"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="132"/>
<source>Quit</source>
<translation>Выйти</translation>
</message>
<message>
<location filename="ui/squawk.ui" line="117"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="133"/>
<source>Add contact</source>
<translation>Добавить контакт</translation>
</message>
<message>
<location filename="ui/squawk.ui" line="128"/>
<location filename="build/ui/squawkUI_autogen/include/ui_squawk.h" line="134"/>
<source>Add conference</source>
<translation>Присоединиться к беседе</translation>
</message>
</context>
</TS>

3
ui/CMakeLists.txt
View File

@ -43,6 +43,3 @@ add_library(squawkUI ${squawkUI_SRC})
# Use the Widgets module from Qt 5.
target_link_libraries(squawkUI Qt5::Widgets)
target_link_libraries(squawkUI Qt5::DBus)
# Install the executable
install(TARGETS squawkUI DESTINATION lib)

2
ui/models/room.h
View File

@ -21,7 +21,7 @@
#include "item.h"
#include "participant.h"
#include "../global.h"
#include "../../global.h"
namespace Models {

2
ui/utils/messageline.h
View File

@ -30,7 +30,7 @@
#include <QGraphicsPixmapItem>
#include <QVariantAnimation>
#include "../global.h"
#include "../../global.h"
#include "message.h"
class MessageLine : public QWidget