diff --git a/source/main.cc b/source/main.cc index 3d7f809..e298fdd 100644 --- a/source/main.cc +++ b/source/main.cc @@ -21,12 +21,7 @@ #include #include "ubl_settings_datetime.h" int main(int argc, char* argv[]) { - - //path_app=filesystem::current_path(); - //path_app+="/"; - //cout << *argv[0] << endl; - //app_name=to_string(*argv[0]); - //app_name=app_name.substr(1, app_name.length()); + string str_argv_1=""; string str_cmd_argv = ""; for (int i=1; i1){ + str_argv_1 = to_string(*argv[1]); + } + + if ((str_argv_1=="--help" || str_argv_1=="--lock-datetime") || (str_argv_1=="--lock-timezone" || str_argv_1=="--lock-ntp") || (str_argv_1=="--lock-update" || argc==1)){ //setlocale(LC_ALL, "."); //bindtextdomain(app_name.c_str(), "."); //textdomain(app_name.c_str()); //textdomain(app_name); - cout << argv[0] << endl; for (int i=0; i #include "ubl_settings_datetime.h" using namespace std; -string path_app= "/usr/bin/"; -string path_glade= "/usr/share/ubl-settings-datetime/ui/"; +string path_app= "/home/superadmin/Документы/Проект/ubconfig_new/ubl-settings-datetime/source/"; +string path_glade= "/home/superadmin/Документы/Проект/ubconfig_new/ubl-settings-datetime/"; string app_name = "ubl-settings-datetime"; +string path_reg = "/home/superadmin/Документы/Проект/ubconfig_new/ubl-settings-datetime/reg/"; bool flag_datetime = false; bool flag_timezone = false; bool flag_ntp = false; @@ -477,7 +478,7 @@ void MainWindow::update_calendar(){ void MainWindow::read_file(){ std::string line; namespace fs = std::filesystem; - for (const auto & entry : fs::directory_iterator("/usr/share/ubl-settings-datetime/reg/")){ + for (const auto & entry : fs::directory_iterator(path_reg)){ std::ifstream in(entry.path()); // окрываем файл для чтения if (in.is_open()) { diff --git a/source/ubl_settings_datetime.h b/source/ubl_settings_datetime.h index 2cbc199..09c2088 100644 --- a/source/ubl_settings_datetime.h +++ b/source/ubl_settings_datetime.h @@ -28,6 +28,7 @@ using namespace std; extern string path_app; extern string path_glade; extern string app_name; +extern string path_reg; extern bool flag_datetime; extern bool flag_timezone; extern bool flag_ntp; @@ -100,7 +101,7 @@ private: Gtk::ComboBoxText *_cbZone; Gtk::ComboBoxText *_cbZoneGlob; Gtk::Entry *_txtNtpServer; - Gtk::MessageDialog *_mess_dchp; + Gtk::Window *_mess_dchp; Gtk::Popover *_popCalendar; Gtk::Calendar *_cldrDate; unsigned int year, month, day;