Applications
/
ubl-settings-datetime
8
0
Fork 3
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Частично исправлены замечания

Browse Source
pull/76/head
Igor Belitskiy 3 years ago
parent 091c02af2f
commit 5e022ea002
9 changed files with 33 additions and 82 deletions
Show Stats Download Patch File Download Diff File

8
Makefile
Unescape View File

@ -115,11 +115,9 @@ install: check uninstall
@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/css/" style.css
@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.svg"
@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" "${pkgname}.png"
@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" bg_top.png
@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" checked.svg
@install -Dm644 -t "${pkgdir}/usr/share/${pkgname}/images/" warning.svg
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "checked.svg"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "warning.svg"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/emblems/" "bg_top.png"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-checked.svg"
@install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/scalable/status/" "ubl-datetime-warning.svg"
@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/
@update-desktop-database --quiet 2>/dev/null
@touch /usr/share/applications

54
close.svg
Unescape View File

@ -1,54 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 24 24"
id="svg2"
version="1.1"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
sodipodi:docname="close.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<metadata
id="metadata12">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs10" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1027"
id="namedview8"
showgrid="false"
inkscape:zoom="8"
inkscape:cx="6.875"
inkscape:cy="11.0625"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
inkscape:pagecheckerboard="0" />
<path
d="M 3.8312451,0.00270105 C 6.6165637,2.6335365 9.2800785,5.3919927 12.002108,8.0876398 14.724116,5.3918531 17.387684,2.6337829 20.172977,0.00270105 l 3.827655,3.82765225 c -2.630952,2.7854245 -5.389244,5.4487758 -8.084944,8.1708607 2.695781,2.722007 5.453855,5.385575 8.084944,8.170866 l -3.827655,3.827648 c -2.78543,-2.630944 -5.448781,-5.389235 -8.170869,-8.084934 -2.7220013,2.695782 -5.3855699,5.453852 -8.1708629,8.084934 L 0.0035959,20.17208 C 2.634542,17.386651 5.3928334,14.723302 8.0885352,12.001214 5.3927504,9.2792119 2.6346777,6.6156425 0.0035959,3.8303533 Z"
style="fill:#ffffff;stroke-width:2.18155"
id="path6"
inkscape:connector-curvature="0" />
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

10
source/ubl-settings-datetime.cc
Unescape View File

@ -125,16 +125,16 @@ void MainWindow::settings() {
lblDateTimeSetting->set_sensitive(false);
btnBoxAboutDialog->set_visible(false);
this->event();
imgInfo->set("/usr/share/icons/hicolor/scalable/status/warning.svg");
imgInfo->set("ubl-datetime-warning");
info_status_app("boxInfoMessError");
lblWarning->set_text(_("The program must be run with superuser privileges!"));
lblWarning->set_text(_("The program must be run as root"));
}
}
int MainWindow::check_root() {
if (geteuid() != 0) {
lblMessageSudo->set_text(_("The program must be run with \nsuperuser privileges!"));
lblMessageSudo->set_text(_("The program must be run as root"));
mess_sudo->show();
return 1;
}
@ -417,7 +417,7 @@ void MainWindow::save_global_local_cfg() {
void MainWindow::info_warning_error(int mess) {
if (error_info > 0 || warning_info > 0) {
info_status_app("boxInfoMessError");
imgInfo->set("/usr/share/icons/hicolor/scalable/status/warning.svg");
imgInfo->set("ubl-datetime-warning");
error_info = 0;
warning_info = 0;
string mess_error = "";
@ -445,7 +445,7 @@ void MainWindow::info_warning_error(int mess) {
}
else {
info_status_app("boxInfoMessOK");
imgInfo->set("/usr/share/icons/hicolor/scalable/status/checked.svg");
imgInfo->set("ubl-datetime-checked");
if (mess == 0) {
lblWarning->set_text(_("Local configuration downloaded successfully"));
}

10
source/ubl-util-standard.c
Unescape View File

@ -52,8 +52,11 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
} else
gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
gtk_widget_show(GTK_WIDGET(plug));
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
gtk_style_context_remove_class(gtk_widget_get_style_context(plug),"bkimButton");
gtk_style_context_remove_class(gtk_widget_get_style_context(toplug),"bkimButton");
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder");
gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button");
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"button");
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
}
if (right_plug_id>0&&RightWidget){
@ -67,8 +70,11 @@ inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, in
} else
gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
gtk_widget_show(GTK_WIDGET(plug));
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkimButtonPlug");
gtk_style_context_remove_class(gtk_widget_get_style_context(plug),"bkimButton");
gtk_style_context_remove_class(gtk_widget_get_style_context(toplug),"bkimButton");
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"noborder");
gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"button");
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"button");
gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
}

18
style.css
Unescape View File

@ -2,7 +2,7 @@
background-color: #ea9999;
}
.cssboxColor1{
background: url("/usr/share/ubl-settings-datetime/images/bg_top.png") no-repeat;
background: url("/usr/share/icons/hicolor/scalable/emblems/bg_top.png") no-repeat;
}
.boxInfoMessOK{
background-color: #f3f0ac;
@ -81,9 +81,23 @@
}
.bkimButtonPlug{
background-color: transparent;
color: rgb(0, 0, 0);
opacity:1.0;
}
.noborder{
border:none;
}
.buttonPlug {
background-color: transparent;
background-repeat: no-repeat;
border: none;
outline: none;
}
.button {
background-image: -gtk-gradient(linear,
left top, left bottom,
from(@entry_background_a),
color-stop(0.20, @entry_background_b),
color-stop(0.85, @entry_background_c),
to(@entry_background_d));
}

0
checked.svg → ubl-datetime-checked.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
warning.svg → ubl-datetime-warning.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

13
ubl-settings-datetime.glade
Unescape View File

@ -60,7 +60,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Load global configuration</property>
<property name="use-underline">True</property>
<style>
<class name="menuitemtop"/>
</style>
@ -71,7 +70,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Load local configuration</property>
<property name="use-underline">True</property>
<style>
<class name="menuitembottom"/>
</style>
@ -89,7 +87,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Help</property>
<property name="use-underline">True</property>
<style>
<class name="menuitemtop"/>
</style>
@ -100,7 +97,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">About</property>
<property name="use-underline">True</property>
<style>
<class name="menuitembottom"/>
</style>
@ -118,7 +114,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save to global and local configuration</property>
<property name="use-underline">True</property>
<style>
<class name="menuitemtop"/>
</style>
@ -129,7 +124,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save global configuration</property>
<property name="use-underline">True</property>
<style>
<class name="menuitemmiddle"/>
</style>
@ -140,7 +134,6 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Save local configuration</property>
<property name="use-underline">True</property>
<style>
<class name="menuitembottom"/>
</style>
@ -1045,9 +1038,6 @@ Format: DD.MM.YYYY</property>
<property name="position">0</property>
</packing>
</child>
<style>
<class name="primary-toolbar"/>
</style>
</object>
<packing>
<property name="position">1</property>
@ -1133,9 +1123,6 @@ Format: DD.MM.YYYY</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="primary-toolbar"/>
</style>
</object>
<packing>
<property name="pack-type">end</property>

2
ubl-settings-datetime_ru.po
Unescape View File

@ -58,7 +58,7 @@ msgstr "По умолчанию"
msgid "The program must be run with \nsuperuser privileges!"
msgstr "Программа должна быть запущена с правами \nсуперпользователя!"
msgid "The program must be run with superuser privileges!"
msgid "The program must be run as root"
msgstr "Программа должна быть запущена с правами суперпользователя!"
msgid "Manual"

Write Preview
Loading…
Cancel
Save