Исправил задачу 65

pull/71/head
Igor Belitskiy 3 years ago
parent 6410c4ca67
commit 14fcfc9f16

@ -17,4 +17,3 @@ fi
echo ":: Updated VERSION ${CURRENT} to ${VER}" 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 {} \; find ../ -maxdepth 2 -type f -iname "${FILE_VERSION}" -exec echo ":: Insert version in file: {}" \; -exec sed "s/VERSION *[[:digit:]]*.*/VERSION ${VER}/" -i {} \;

@ -13,7 +13,7 @@ find_package(ICU REQUIRED COMPONENTS uc dt in io)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-O2 -pipe -fno-plt -fexceptions \ -O2 -pipe -fno-plt -fexceptions \
-Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-fstack-clash-protection -fcf-protection") -fstack-clash-protection -fcf-protection -g")
set(SOURCE_FILES set(SOURCE_FILES
ubl-util-standard.h ubl-util-standard.h

@ -101,7 +101,6 @@ void MainWindow::settings(){
lblSynchronizebChkGLob->set_sensitive(false); lblSynchronizebChkGLob->set_sensitive(false);
cbDhcp->set_sensitive(false); cbDhcp->set_sensitive(false);
txtNtpServer->set_sensitive(false); txtNtpServer->set_sensitive(false);
lblZone1Glob->set_sensitive(false);
lblDateTimeSetting->set_sensitive(false); lblDateTimeSetting->set_sensitive(false);
btnBoxAboutDialog->set_visible(false); btnBoxAboutDialog->set_visible(false);
this->event(); this->event();
@ -370,7 +369,6 @@ void MainWindow::save_global_local_cfg(){
string remove = ""; string remove = "";
if (flag_save_global==false){ if (flag_save_global==false){
this->save_local_cfg(); this->save_local_cfg();
} }
if (flag_save_local==false){ if (flag_save_local==false){
this->save_global_cfg(); this->save_global_cfg();

@ -72,7 +72,6 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Label *lblTimeZone; Gtk::Label *lblTimeZone;
Gtk::Label *lblReg; Gtk::Label *lblReg;
Gtk::Label *lblZone; Gtk::Label *lblZone;
Gtk::Label *lblZone1Glob;
Gtk::Label *lblSynchronizebChk; Gtk::Label *lblSynchronizebChk;
Gtk::Label *lblSynchronizebChkGLob; Gtk::Label *lblSynchronizebChkGLob;
Gtk::Label *lblSynchronizeBtn; Gtk::Label *lblSynchronizeBtn;

@ -39,28 +39,24 @@
margin:2px 2px 0 2px; margin:2px 2px 0 2px;
padding: 5px 10px 3px 5px; padding: 5px 10px 3px 5px;
background:@theme_selected_bg_color; background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent; border-color:transparent;
} }
.menuitemmiddle:hover* { .menuitemmiddle:hover* {
margin:0 2px 0 2px; margin:0 2px 0 2px;
padding: 3px 10px 3px 5px; padding: 3px 10px 3px 5px;
background:@theme_selected_bg_color; background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent; border-color:transparent;
} }
.menuitembottom:hover* { .menuitembottom:hover* {
margin:0 2px 2px 2px; margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px; padding: 3px 10px 5px 5px;
background:@theme_selected_bg_color; background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent; border-color:transparent;
} }
.menuitembottom{ .menuitembottom{
margin-top:0px; margin-top:0px;
border-color:alpha(@theme_text_color, 0.4); border-color:alpha(@theme_text_color, 0.4);
border-style:solid; border-style:solid;
border-radius:0 0 5px 5px;
border-left-width:1px; border-left-width:1px;
border-bottom-width:1px; border-bottom-width:1px;
border-right-width:1px; border-right-width:1px;
@ -78,7 +74,6 @@
margin-bottom:0px; margin-bottom:0px;
border-color:alpha(@theme_text_color, 0.4); border-color:alpha(@theme_text_color, 0.4);
border-style:solid; border-style:solid;
border-radius:5px 5px 0 0;
border-left-width:1px; border-left-width:1px;
border-top-width:1px; border-top-width:1px;
border-right-width:1px; border-right-width:1px;

Loading…
Cancel
Save