Applications
/
ubl-settings-logging
7
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fixes' (#146) from YanTheKaller/ubl-settings-logging:master into master

Browse Source 
Reviewed-on: #146
pull/147/head^2
Dmitry Razumov 3 months ago
parent 3dea2ec25d b077718b44
commit 7d8532c933
8 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
Makefile
Unescape View File

@ -82,7 +82,6 @@ uninstall:
$(RM) "$${PATH_FILE_MO}"; \
done
@for SIZE in 16x16 32x32 48x48 scalable; do \
$(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 \
@ -120,11 +119,10 @@ install: check uninstall
done
@for SIZE in 16 32 48; do \
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done
@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@for FILE_ICON in $(wildcard icons/*/*.svg); do \
SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \
install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \

3
gresource.xml
Unescape View File

@ -16,9 +16,6 @@
<gresource prefix="/com/ublinux/css">
<file>ubl-settings-logging.css</file>
</gresource>
<gresource prefix="/com/ublinux/images">
<file>ubl-settings-logging-banner.png</file>
</gresource>
<gresource prefix="/com/ublinux/csv">
<file>journals_list.csv</file>
<file>logging_services.csv</file>

0
com.ublinux.ubl-settings-logging.svg → icons/apps/com.ublinux.ubl-settings-logging.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

2
locale/ubl-settings-logging_ru.po
Unescape View File

@ -467,7 +467,7 @@ msgstr "Настройки файлов и папок"
#: source/ubl-strings.h:137
msgid "Delay compression by one journal in queue:"
msgstr "Отложить сжание на один журнал в очереди:"
msgstr "Отложить сжатие на один журнал в очереди:"
#: source/ubl-strings.h:138
msgid "Compression configuration"

1
source/CMakeLists.txt
Unescape View File

@ -48,7 +48,6 @@ set(DEPENDFILES
../ubl-settings-logging-terminal.glade
../ubl-settings-logging-saving.glade
../gresource.xml
../ubl-settings-logging-banner.png
../ubl-settings-logging.css
../journals_list.csv
../logging_services.csv

BIN
ubl-settings-logging-banner.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

26
ubl-settings-logging-logrotate.glade
Unescape View File

@ -140,6 +140,7 @@
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hscrollbar-policy">never</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkViewport">
@ -634,6 +635,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="max-width-chars">3</property>
</object>
<packing>
<property name="expand">False</property>
@ -1221,6 +1223,18 @@
<property name="position">5</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
@ -1230,7 +1244,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
<property name="position">0</property>
</packing>
</child>
<child>
@ -1239,11 +1253,13 @@
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="max-length">3</property>
<property name="width-chars">3</property>
<property name="max-width-chars">3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
<property name="position">1</property>
</packing>
</child>
<child>
@ -1257,14 +1273,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">8</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="position">1</property>
</packing>
</child>
<child>
@ -1290,7 +1306,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</object>

5
ubl-settings-logging.glade
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2
<!-- Generated with glade 3.40.0
ubl-settings-logging -
Copyright (C) UBGroup
@ -255,7 +255,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<object class="GtkTreeViewColumn">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="fixed-width">130</property>
<property name="fixed-width">240</property>
<property name="min-width">50</property>
<property name="title" translatable="yes">Path</property>
<child>
<object class="GtkCellRendererText">

Write Preview
Loading…
Cancel
Save