diff --git a/Makefile b/Makefile
index 9020224..d8a02b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-#!/usr/bin/make -f
#SHELL := /bin/bash
MAKEFILE_FILEPATH := $(abspath $(lastword $(MAKEFILE_LIST)))
@@ -7,52 +6,58 @@ MAKEFILE_DIR := $(notdir $(patsubst %/,%,$(dir $(MAKEFILE_FILEPATH))))
MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
CMAKE_COMMAND = cmake
-#CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
-#CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-CMAKE_SOURCE_DIR = ./source
-CMAKE_BUILD_DIR = ./compile
-DEPENDS = cmake
-pkgname = $(MAKEFILE_DIR)
-#pkgname = ubl-settings-datetime
-pkgdir =
+CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
+CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
+#CMAKE_SOURCE_DIR = ./source
+#CMAKE_BUILD_DIR = ./compile
+FILE_VERSION = VERSION.md
+DEPENDS = /bin/cmake
+PREFIX ?= /usr
+PKGNAME = $(MAKEFILE_DIR)
+#PKGNAME = ubl-settings-datetime
default_target: all
+
+.PHONY: all init depend debug prepare check build uninstall install clean up_ver help
+
all: init build
init:
@echo "Initialize ..."; \
- sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' VERSION.md | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.cc; \
+ sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.cc; \
echo "-- Build path: ${CMAKE_BUILD_DIR}"
-
+
depend:
- @echo "Check depends ..."; \
- if [ ! -f /bin/${DEPENDS} ]; then \
- echo "-- Depend '${DEPENDS}' not fount !"; \
- exit 1; \
- fi; \
+ @echo "Check depends ..."
+ @for FILE_DEPEND in $(DEPENDS); do \
+ if [ ! -f $${FILE_DEPEND} ]; then \
+ echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \
+ exit 1; \
+ fi; \
+ done; \
echo "Check depends: OK"
# $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
debug:
@echo "Debug ..."
if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
- $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \
+ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
fi; \
echo "Debug: OK"
prepare:
@echo "Prepare ..."; \
if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
- $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \
+ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
fi; \
echo "Prepare: OK"
check:
@echo "Check ..."; \
- if [ -f ${CMAKE_BUILD_DIR}/${pkgname} ]; then \
+ if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \
echo "Check: OK"; \
else \
- echo "Check: ${CMAKE_BUILD_DIR}/${pkgname} not fount !"; \
+ echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not found !"; \
exit 1; \
fi
@@ -66,55 +71,63 @@ uninstall:
@for FILE_PO in $(wildcard *.po); do \
LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
- PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
- $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+ PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+ $(RM) "$${PATH_FILE_MO}"; \
done
@for SIZE in 16x16 32x32 48x48 scalable; do \
- $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${pkgname}.svg"; \
- $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${pkgname}.png"; \
- done
+ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
+ done
@for FILE_SVG in $(wildcard *.svg); do \
for SIZE in 16x16 32x32 48x48 scalable; do \
- $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
+ $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
done; \
done
- @$(RM) "/usr/bin/${pkgname}"
- @$(RM) "/usr/share/applications/${pkgname}.desktop"
- @$(RM) "/usr/share/polkit-1/actions/ru.ublinux.pkexec.${pkgname}.exec.policy"
- @$(RM) -rd "/usr/share/${pkgname}"
- @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null || true
- @update-desktop-database --quiet &>/dev/null || true
- @touch /usr/share/applications &>/dev/null || true
+ @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
+ @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
+ @$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/logo-background.png"
+ @$(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.pkexec.${PKGNAME}.exec.policy"
+ @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
+ @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
+ @if [ -z ${DESTDIR} ]; then \
+ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
+ update-desktop-database --quiet &>/dev/null || true; \
+ [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+ fi
@echo "Uninstall: OK"
install: check uninstall
@echo "Install ..."
@for FILE_PO in $(wildcard *.po); do \
LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
- install -dm755 "${pkgdir}/usr/share/locale/$${LANG}/LC_MESSAGES"; \
+ install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
- PATH_FILE_MO="${pkgdir}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
- echo $${FILE_PO}; \
+ PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+ echo "$${FILE_PO}"; \
msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \
done
@for SIZE in 16 32 48; do \
- install -dm755 "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
- rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "ru.ublinux.${pkgname}.svg" -o "${pkgdir}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${pkgname}.png"; \
+ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
+ rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
done
- @install -dm755 "${pkgdir}/usr/share/icons/hicolor/scalable/apps"
- @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" "ru.ublinux.${pkgname}.svg"
- @install -Dm755 -t "${pkgdir}/usr/bin/" "${CMAKE_BUILD_DIR}/${pkgname}"
- @install -Dm644 -t "${pkgdir}/usr/share/applications/" "${pkgname}.desktop"
- @install -Dm644 -t "${pkgdir}/usr/share/polkit-1/actions/" "ru.ublinux.pkexec.${pkgname}.exec.policy"
- @install -dm755 "${pkgdir}/usr/share/${pkgname}"/{ui,css,images}
- @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/ui/" "${pkgname}.glade"
- @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css
- @install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "logo-background.png"
- @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.checked.svg"
- @install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ru.ublinux.ubl-settings-datetime.warning.svg"
- @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null || true
- @update-desktop-database --quiet &>/dev/null || true
- @touch /usr/share/applications &>/dev/null || true
+ @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+ @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
+ @install -dm755 "${DESTDIR}${PREFIX}/share/applications"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
+ @install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.pkexec.${PKGNAME}.exec.policy"
+ @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-datetime.checked.svg"
+ @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-datetime.warning.svg"
+ @if [ -z ${DESTDIR} ]; then \
+ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
+ update-desktop-database --quiet &>/dev/null || true; \
+ [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+ fi
@echo "Install: OK"
clean:
@@ -126,6 +139,14 @@ clean:
echo "Clean: OK"; \
fi
+up_ver:
+ @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \
+ MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \
+ MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \
+ VER="$${MAJOR}.$$(($${MINOR}+1))"; \
+ sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \
+ echo "Updated version to VERSION.md: $${CURRENT} to $${VER}"
+
help:
@echo "The following are some of the valid targets for this Makefile:"
@echo "... all (the default if no target is provided)"
diff --git a/ru.ublinux.pkexec.ubl-settings-datetime.exec.policy b/com.ublinux.pkexec.ubl-settings-datetime.exec.policy
similarity index 93%
rename from ru.ublinux.pkexec.ubl-settings-datetime.exec.policy
rename to com.ublinux.pkexec.ubl-settings-datetime.exec.policy
index 3aa3714..ab1f268 100644
--- a/ru.ublinux.pkexec.ubl-settings-datetime.exec.policy
+++ b/com.ublinux.pkexec.ubl-settings-datetime.exec.policy
@@ -7,7 +7,7 @@
UBLinux
https://ublinux.ru
-
+
Run "Time date settings" as root
Запуск настройки даты и времени" с правами root
Authentication is required to run the time date settings
diff --git a/ru.ublinux.ubl-settings-datetime.alert.svg b/com.ublinux.ubl-settings-datetime.alert.svg
similarity index 100%
rename from ru.ublinux.ubl-settings-datetime.alert.svg
rename to com.ublinux.ubl-settings-datetime.alert.svg
diff --git a/ru.ublinux.ubl-settings-datetime.checked.svg b/com.ublinux.ubl-settings-datetime.checked.svg
similarity index 100%
rename from ru.ublinux.ubl-settings-datetime.checked.svg
rename to com.ublinux.ubl-settings-datetime.checked.svg
diff --git a/ru.ublinux.ubl-settings-datetime.svg b/com.ublinux.ubl-settings-datetime.svg
similarity index 100%
rename from ru.ublinux.ubl-settings-datetime.svg
rename to com.ublinux.ubl-settings-datetime.svg
diff --git a/ru.ublinux.ubl-settings-datetime.warning.svg b/com.ublinux.ubl-settings-datetime.warning.svg
similarity index 100%
rename from ru.ublinux.ubl-settings-datetime.warning.svg
rename to com.ublinux.ubl-settings-datetime.warning.svg
diff --git a/devel/update-version b/devel/update-version
deleted file mode 100755
index e86b1b4..0000000
--- a/devel/update-version
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-##
-## Update VERSION 1.4
-## $1 - Version
-## Default - current Version value plus one (in minor section)
-##
-
-FILE_VERSION="VERSION.md"
-[[ $1 ]] && VER=$1
-if [[ -z ${VER} ]] ; then
- SOURCE_FILE_VERSION=$(find ../ -maxdepth 1 -type f -iname "${FILE_VERSION}" -print -quit)
- CURRENT=$(cat ${SOURCE_FILE_VERSION} | grep 'VERSION' | cut -d" " -f2)
- MAJOR=$(echo ${CURRENT} | cut -d. -f1)
- MINOR=$(echo ${CURRENT} | cut -d. -f2)
- VER="${MAJOR}.$(echo $((${MINOR} +1)))"
-fi
-echo ":: Updated VERSION ${CURRENT} to ${VER}"
-find ../ -maxdepth 2 -type f -iname "${FILE_VERSION}" -exec echo ":: Insert version in file: {}" \; -exec sed "s/VERSION *[[:digit:]]*.*/VERSION ${VER}/" -i {} \;
\ No newline at end of file
diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc
index 206e2aa..99a11c9 100755
--- a/source/ubl-settings-datetime.cc
+++ b/source/ubl-settings-datetime.cc
@@ -6,7 +6,8 @@ const string path_app = "/usr/bin/";
const string path_glade = "/usr/share/ubl-settings-datetime/ui/";
const string app_name = "ubl-settings-datetime";
const string path_locale = "/usr/share/locale/";
-const string path_css = "/usr/share/ubl-settings-datetime/css/style.css";
+const string path_css = "/usr/share/ubl-settings-datetime/css/ubl-settings-datetime.css";
+const string path_img_head_background = "/usr/share/ubl-settings-datetime/images/logo-background.png";
bool flag_datetime = false;
bool flag_timezone = false;
bool flag_ntp_mode = false;
@@ -54,36 +55,40 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) {
}
void MainWindow::settings() {
- map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(": \"xdg-open\""));
- map_error["ubconfig --default --source system get clock ZONE"] = string(_(": \"Time Zone\""));
- map_error["hwclock --systohc"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --default --source system get network NTPSERVERS"] = string(_(": \"NTP\""));
- map_error["ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(": \"NTP\""));
- map_error["ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --default --source global get network NTPSERVERS"] = string(_(": \"NTP\""));
- map_error["ubconfig --default --source global get clock ZONE"] = string(_(": \"Time Zone\""));
- map_error["ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --target system set clock ZONE="] = string(_(": \"Time Zone\""));
- map_error["ubconfig --target system set network NTPSERVERS=default"] = string(_(": \"NTP\""));
- map_error["ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(": \"NTP\""));
- map_error["ubconfig --target system set network NTPSERVERS=\""] = string(_(": \"NTP\""));
- map_error["ubconfig --target system remove network NTPSERVERS"] = string(_(": \"NTP\""));
- map_error["ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --target global set clock ZONE="] = string(_(": \"Time Zone\""));
- map_error["ubconfig --target global set network NTPSERVERS=default"] = string(_(": \"NTP\""));
- map_error["ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(": \"NTP\""));
- map_error["ubconfig --target global set network NTPSERVERS=\""] = string(_(": \"NTP\""));
- map_error["ubconfig --target global remove network NTPSERVERS"] = string(_(": \"NTP\""));
- map_error["ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\""));
- map_error["ubconfig --source default get [] NTPSERVERS_DEFAULT"] = string(_(": \"NTP\""));
- map_error["date +%Y%m%d -s \""] = string(_(": \"Date\""));
- map_error["date +%T -s \""] = string(_(": \"Date\""));
- map_error["ubconfig --source default get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\""));
+ map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(gettext(": \"xdg-open\""));
+ map_error["ubconfig --default --source system get clock ZONE"] = string(gettext(": \"Time Zone\""));
+ map_error["hwclock --systohc"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --default --source system get network NTPSERVERS"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --default --source global get network NTPSERVERS"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --default --source global get clock ZONE"] = string(gettext(": \"Time Zone\""));
+ map_error["ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --source global get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --target system set clock ZONE="] = string(gettext(": \"Time Zone\""));
+ map_error["ubconfig --target system set network NTPSERVERS=default"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target system set network NTPSERVERS=dhcp"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target system set network NTPSERVERS=\""] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target system remove network NTPSERVERS"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --target global set clock ZONE="] = string(gettext(": \"Time Zone\""));
+ map_error["ubconfig --target global set network NTPSERVERS=default"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target global set network NTPSERVERS=dhcp"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target global set network NTPSERVERS=\""] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target global remove network NTPSERVERS"] = string(gettext(": \"NTP\""));
+ map_error["ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(gettext(": \"Hardware time\""));
+ map_error["ubconfig --source default get [] NTPSERVERS_DEFAULT"] = string(gettext(": \"NTP\""));
+ map_error["date +%Y%m%d -s \""] = string(gettext(": \"Date\""));
+ map_error["date +%T -s \""] = string(gettext(": \"Date\""));
+ map_error["ubconfig --source default get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\""));
this->get_builder();
this->add_CSS();
+ Gtk::Widget *boxWidget;
+ builder->get_widget("boxColor", boxWidget);
+ overHead->add_overlay(*boxWidget);
+
ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I);
year = 0;
month = 0;
@@ -110,9 +115,9 @@ void MainWindow::settings() {
boxButton->set_sensitive(false);
btnSave->set_sensitive(false);
this->event();
- imgInfo->set_from_icon_name("ru.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU);
+ imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU);
info_status_app("boxInfoMessError");
- lblWarning->set_text(_("The program must be run as root"));
+ lblWarning->set_text(gettext("The program must be run as root"));
}
}
@@ -120,35 +125,35 @@ void MainWindow::lacalization() {
time_t now = time(0);
tm *ltm = localtime(&now);
unsigned int year = 1900+ ltm->tm_year;
- string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year);
+ string str_authors = string(gettext("Copyright © UBSoft LLC, 2022 - ")) + to_string(year);
aboutWindows->set_copyright(str_authors);
- aboutWindows->set_comments(_("Date and Time"));
- aboutWindows->set_website(_("https://wiki.ublinux.com"));
- aboutWindows->set_version(_(version_application.c_str()));
- aboutWindows->set_website_label(_("Project Home Page"));
- lblSave->set_label(_("Save"));
- lblLoad->set_label(_("Load"));
- txtDate->set_tooltip_text(_("Date of\nFormat: DD.MM.YYYY"));
- txtNtpServer->set_tooltip_text(_("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas."));
- lblSynchronizebChkGLob->set_text(_("Synchronize via NTP"));
- cbDhcp->append(_("Default"));
- cbDhcp->append(_("DHCP"));
- cbDhcp->append(_("Manual"));
- cbDhcp->append(_("Disabled"));
- lblDateTimeSetting->set_text(_("Current date and time"));
- lblHead->set_text(_("Setting the date and time"));
- lblTime->set_text(_("Time:"));
- lblData->set_text(_("Date:"));
- lblTimeZone->set_text(_("Time zone"));
- lblReg->set_text(_("Region:"));
- lblZone->set_text(_("Zone:"));
- lblSynchronizeBtn->set_text(_("Sync by"));
- lblHeader->set_text(_("ubl-settings-datetime"));
- windowMessDchp->set_title(_("Warning!"));
- lblTimeBios->set_text(_("Synchronize hardware time"));
- lblHW->set_text(_("Synchronize hardware time:"));
- array_hw_local[0] = _("UTC time");
- array_hw_local[1] = _("Local time");
+ aboutWindows->set_comments(gettext("Date and Time"));
+ aboutWindows->set_website(gettext("https://wiki.ublinux.com"));
+ aboutWindows->set_version(gettext(version_application.c_str()));
+ aboutWindows->set_website_label(gettext("Project Home Page"));
+ lblSave->set_label(gettext("Save"));
+ lblLoad->set_label(gettext("Load"));
+ txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY"));
+ txtNtpServer->set_tooltip_text(gettext("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas."));
+ lblSynchronizebChkGLob->set_text(gettext("Synchronize via NTP"));
+ cbDhcp->append(gettext("Default"));
+ cbDhcp->append(gettext("DHCP"));
+ cbDhcp->append(gettext("Manual"));
+ cbDhcp->append(gettext("Disabled"));
+ lblDateTimeSetting->set_text(gettext("Current date and time"));
+ lblHead->set_text(gettext("Setting the date and time"));
+ lblTime->set_text(gettext("Time:"));
+ lblData->set_text(gettext("Date:"));
+ lblTimeZone->set_text(gettext("Time zone"));
+ lblReg->set_text(gettext("Region:"));
+ lblZone->set_text(gettext("Zone:"));
+ lblSynchronizeBtn->set_text(gettext("Sync by"));
+ lblHeader->set_text(gettext("ubl-settings-datetime"));
+ windowMessDchp->set_title(gettext("Warning!"));
+ lblTimeBios->set_text(gettext("Synchronize hardware time"));
+ lblHW->set_text(gettext("Synchronize hardware time:"));
+ array_hw_local[0] = gettext("UTC time");
+ array_hw_local[1] = gettext("Local time");
array_hw[0] = "utc";
array_hw[1] = "localtime";
this->bubble_sort(array_hw, array_hw_local, 2);
@@ -224,8 +229,7 @@ void MainWindow::add_CSS() {
Glib::RefPtr styleContext = Gtk::StyleContext::create();
Glib::RefPtr screen = Gdk::Screen::get_default();//get default screen
styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application
- Glib::RefPtr boxColor_css = boxColor->get_style_context();
- boxColor_css->add_class("cssboxColor1");
+ imgHeadBackground->set(path_img_head_background);
Glib::RefPtr lblHead_css = lblHead->get_style_context();
Glib::RefPtr boxButton_css = boxButton->get_style_context();
Glib::RefPtr boxSave_css = boxSave->get_style_context();
@@ -308,6 +312,9 @@ void MainWindow::get_builder() {
builder->get_widget("imgSettings", imgSettings);
builder->get_widget("imgSave", imgSave);
builder->get_widget("boxWidgetFunc", boxWidgetFunc);
+ builder->get_widget("overHead", overHead);
+ builder->get_widget("imgHeadBackground", imgHeadBackground);
+
}
void MainWindow::gui_exit() {
@@ -384,7 +391,7 @@ void MainWindow::event_zone() {
void MainWindow::synopsis_show() {
int start_error = error_info;
- string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name;
+ string cmd = "xdg-open " + string(gettext("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name;
if (geteuid() == 0) {
string response_user = getlogin();
cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \"";
@@ -430,7 +437,7 @@ void MainWindow::load_globl_cfg() {
void MainWindow::save_local_cfg() {
if ((this->check_config("region", 0) && this->check_config("zone", 0) &&
this->check_config("dhcp", 0) && this->check_config("hw", 0))) {
- lblWarning->set_text(_("Nothing to save!"));
+ lblWarning->set_text(gettext("Nothing to save!"));
}
else {
string cmd_zone = "ubconfig --target system set clock ZONE=";
@@ -461,7 +468,7 @@ void MainWindow::save_local_cfg() {
void MainWindow::save_global_cfg() {
if ((this->check_config("region", 1) && this->check_config("zone", 1) &&
this->check_config("dhcp", 1) && this->check_config("hw", 1))) {
- lblWarning->set_text(_("Nothing to save!"));
+ lblWarning->set_text(gettext("Nothing to save!"));
}
else {
string cmd = "ubconfig --target global set clock ZONE=";
@@ -491,7 +498,7 @@ void MainWindow::save_global_cfg() {
void MainWindow::save_global_local_cfg() {
if ((this->check_config("region", 2) && this->check_config("zone", 2) &&
this->check_config("dhcp", 2) && this->check_config("hw", 2))) {
- lblWarning->set_text(_("Nothing to save!"));
+ lblWarning->set_text(gettext("Nothing to save!"));
}
else {
string cmd = "";
@@ -654,49 +661,49 @@ string MainWindow::get_ubconfig_value(string &cmd){
void MainWindow::info_warning_error(int mess) {
if (error_info > 0 || warning_info > 0) {
info_status_app("boxInfoMessError");
- imgInfo->set_from_icon_name("ru.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU);
+ imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU);
error_info = 0;
warning_info = 0;
string mess_error = "";
if (mess == 0) {
- mess_error = string(_("Local configuration reading error")) + cmd_error;
+ mess_error = string(gettext("Local configuration reading error")) + cmd_error;
lblWarning->set_text(mess_error);
}
else if (mess == 1) {
- mess_error = string(_("Global configuration read error")) + cmd_error;
+ mess_error = string(gettext("Global configuration read error")) + cmd_error;
lblWarning->set_text(mess_error);
}
else if (mess == 2) {
- mess_error = string(_("Local configuration write error")) + cmd_error;
+ mess_error = string(gettext("Local configuration write error")) + cmd_error;
lblWarning->set_text(mess_error);
}
else if (mess == 3) {
- mess_error = string(_("Global configuration write error")) + cmd_error;
+ mess_error = string(gettext("Global configuration write error")) + cmd_error;
lblWarning->set_text(mess_error);
}
else if (mess == 4) {
- mess_error = string(_("Error saved local and global configuration")) + cmd_error;
+ mess_error = string(gettext("Error saved local and global configuration")) + cmd_error;
lblWarning->set_text(mess_error);
}
cmd_error = "";
}
else {
info_status_app("boxInfoMessOK");
- imgInfo->set_from_icon_name("ru.ublinux.ubl-settings-datetime.checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
+ imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT);
if (mess == 0) {
- lblWarning->set_text(_("Local configuration downloaded successfully"));
+ lblWarning->set_text(gettext("Local configuration downloaded successfully"));
}
else if (mess == 1) {
- lblWarning->set_text(_("Global configuration downloaded successfully"));
+ lblWarning->set_text(gettext("Global configuration downloaded successfully"));
}
else if (mess == 2) {
- lblWarning->set_text(_("Local configuration successfully written"));
+ lblWarning->set_text(gettext("Local configuration successfully written"));
}
else if (mess == 3) {
- lblWarning->set_text(_("Global configuration successfully written"));
+ lblWarning->set_text(gettext("Global configuration successfully written"));
}
else if (mess == 4) {
- lblWarning->set_text(_("Successfully saved local and global configuration"));
+ lblWarning->set_text(gettext("Successfully saved local and global configuration"));
}
}
}
@@ -788,7 +795,7 @@ void MainWindow::gui_mess_close() {
bool MainWindow::focus_ntp_text() {
if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") {
- lblMessage->set_text(_("Enter DHCP!"));
+ lblMessage->set_text(gettext("Enter DHCP!"));
windowMessDchp->show();
}
else {
@@ -814,11 +821,11 @@ bool MainWindow::focus_ntp_text() {
}
else {
if (flag_error == true) {
- lblMessage->set_text(_("An invalid character is entered"));
+ lblMessage->set_text(gettext("An invalid character is entered"));
windowMessDchp->show();
}
else if (flag_error_check_ntp == true) {
- lblMessage->set_text(_("Error in the ntp name"));
+ lblMessage->set_text(gettext("Error in the ntp name"));
windowMessDchp->show();
}
return false;
@@ -1051,7 +1058,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc
// btnUpdateDateTime->set_sensitive(false);
if (str_dhcp == "") {
this->write_config("", "dhcp");
- lblMessage->set_text(_("Enter DHCP!"));
+ lblMessage->set_text(gettext("Enter DHCP!"));
windowMessDchp->show();
}
else if (str_dhcp == "(null)") {
@@ -1230,7 +1237,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
int size_vec = array_region_local.size();
if (size_vec== 0) {
for (auto& [key, value]: time_reg_map) {
- array_region_local.push_back(string(_(key.c_str())));
+ array_region_local.push_back(string(gettext(key.c_str())));
array_region.push_back(key);
index += 1;
}
@@ -1256,7 +1263,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
if (size_vec == 0) {
tmpCbReg->append(Glib::ustring(reg));
}
- if (reg == string(_(region.c_str()))) {
+ if (reg == string(gettext(region.c_str()))) {
tmpCbReg->set_active_text(reg);
}
}
@@ -1266,7 +1273,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex
string path_reg_zone = "";
string zone_offest = "";
path_reg_zone = region + "/" + zone;
- zone_offest = this->zone_file_read(path_reg_zone) + _(zone.c_str());
+ zone_offest = this->zone_file_read(path_reg_zone) + gettext(zone.c_str());
if (region == "") {
tmpCbZone->append(" ");
tmpCbZone->set_active(0);
@@ -1399,12 +1406,12 @@ void MainWindow::post_entry_data() {
string str_error_clock = this->call(cmd);
size_t index = str_error_clock.find("date:");
if (index != std::string::npos) {
- lblMessage->set_text(_("Incorrect date format"));
+ lblMessage->set_text(gettext("Incorrect date format"));
windowMessDchp->show();
}
}
else {
- lblMessage->set_text(_("Incorrect date format"));
+ lblMessage->set_text(gettext("Incorrect date format"));
windowMessDchp->show();
}
}
@@ -1469,7 +1476,7 @@ void MainWindow::read_file() {
string reg_reg_zone = entry_reg_reg_zone.path().filename().string();
zone.push_back(reg_reg_zone);
path_reg_zone=key_reg + "/" + reg_reg_zone;
- key_zone_local = this->zone_file_read(path_reg_zone) + _(reg_reg_zone.c_str());
+ key_zone_local = this->zone_file_read(path_reg_zone) + gettext(reg_reg_zone.c_str());
zone_local.push_back(key_zone_local);
}
in2.close();
@@ -1478,7 +1485,7 @@ void MainWindow::read_file() {
else if (key_zone.length() != 0 || key_zone != " ") {
zone.push_back(key_zone);
path_reg_zone = key_reg + "/" + key_zone;
- key_zone_local = this->zone_file_read(path_reg_zone) + _(key_zone.c_str());
+ key_zone_local = this->zone_file_read(path_reg_zone) + gettext(key_zone.c_str());
zone_local.push_back(key_zone_local);
}
}
diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h
index 83ee0a5..cf0933d 100644
--- a/source/ubl-settings-datetime.h
+++ b/source/ubl-settings-datetime.h
@@ -27,6 +27,7 @@ extern const string path_glade;
extern const string app_name;
extern const string path_locale;
extern const string path_css;
+extern const string path_img_head_background;
extern bool flag_datetime;
extern bool flag_timezone;
extern bool flag_ntp_mode;
@@ -114,6 +115,8 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Image *imgLoad;
Gtk::Image *imgSave;
Gtk::Image *imgSettings;
+ Gtk::Overlay *overHead;
+ Gtk::Image *imgHeadBackground;
string array_hw[2];
string array_hw_local[2];
bool flag_load = false;
diff --git a/style.css b/ubl-settings-datetime.css
similarity index 93%
rename from style.css
rename to ubl-settings-datetime.css
index e323d55..57095ec 100644
--- a/style.css
+++ b/ubl-settings-datetime.css
@@ -1,9 +1,7 @@
.boxInfoMessError{
background-color: #ea9999;
}
-.cssboxColor1{
- background: url("/usr/share/ubl-settings-datetime/images/logo-background.png") no-repeat;
-}
+
.boxInfoMessOK{
background-color: #f3f0ac;
}
diff --git a/ubl-settings-datetime.desktop b/ubl-settings-datetime.desktop
index edc26a9..11ef493 100644
--- a/ubl-settings-datetime.desktop
+++ b/ubl-settings-datetime.desktop
@@ -8,7 +8,7 @@ Comment=Date time settings
Comment[ru]=Приложение для настройки даты и времени
Type=Application
Exec=pkexec ubl-settings-datetime
-Icon=ru.ublinux.ubl-settings-datetime
+Icon=com.ublinux.ubl-settings-datetime
Terminal=false
X-XfcePluggable=true
X-UBLPluggable=true
diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade
index ff5c144..a62872a 100644
--- a/ubl-settings-datetime.glade
+++ b/ubl-settings-datetime.glade
@@ -23,7 +23,7 @@
Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>.
UBGroup
UBGroup
- ru.ublinux.ubl-settings-datetime
+ com.ublinux.ubl-settings-datetime
True
gpl-2-0
@@ -51,6 +51,94 @@
+