Исправлено окно предупреждения

pull/16/head
Igor Belitskiy 3 years ago
parent 719f4abfb1
commit b6775f6b89

@ -21,12 +21,7 @@
#include <stdio.h> #include <stdio.h>
#include "ubl_settings_datetime.h" #include "ubl_settings_datetime.h"
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
string str_argv_1="";
//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_cmd_argv = ""; string str_cmd_argv = "";
for (int i=1; i<argc; i++){ for (int i=1; i<argc; i++){
str_cmd_argv+= to_string(*argv[i]) + " "; str_cmd_argv+= to_string(*argv[i]) + " ";
@ -40,14 +35,17 @@ int main(int argc, char* argv[]) {
} }
auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade"); auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade");
if (argc==1){ if (argc>1){
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, "."); //setlocale(LC_ALL, ".");
//bindtextdomain(app_name.c_str(), "."); //bindtextdomain(app_name.c_str(), ".");
//textdomain(app_name.c_str()); //textdomain(app_name.c_str());
//textdomain(app_name); //textdomain(app_name);
cout << argv[0] << endl;
for (int i=0; i<argc; i++){ for (int i=0; i<argc; i++){
if (strcmp(argv[i],"--help")){ if (strcmp(argv[i],"--help")==0){
help(); help();
return 1; return 1;
} }

Binary file not shown.

@ -22,9 +22,10 @@
#include <stdio.h> #include <stdio.h>
#include "ubl_settings_datetime.h" #include "ubl_settings_datetime.h"
using namespace std; using namespace std;
string path_app= "/usr/bin/"; string path_app= "/home/superadmin/Документы/Проект/ubconfig_new/ubl-settings-datetime/source/";
string path_glade= "/usr/share/ubl-settings-datetime/ui/"; string path_glade= "/home/superadmin/Документы/Проект/ubconfig_new/ubl-settings-datetime/";
string app_name = "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_datetime = false;
bool flag_timezone = false; bool flag_timezone = false;
bool flag_ntp = false; bool flag_ntp = false;
@ -477,7 +478,7 @@ void MainWindow::update_calendar(){
void MainWindow::read_file(){ void MainWindow::read_file(){
std::string line; std::string line;
namespace fs = std::filesystem; 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()); // окрываем файл для чтения std::ifstream in(entry.path()); // окрываем файл для чтения
if (in.is_open()) if (in.is_open())
{ {

@ -28,6 +28,7 @@ using namespace std;
extern string path_app; extern string path_app;
extern string path_glade; extern string path_glade;
extern string app_name; extern string app_name;
extern string path_reg;
extern bool flag_datetime; extern bool flag_datetime;
extern bool flag_timezone; extern bool flag_timezone;
extern bool flag_ntp; extern bool flag_ntp;
@ -100,7 +101,7 @@ private:
Gtk::ComboBoxText *_cbZone; Gtk::ComboBoxText *_cbZone;
Gtk::ComboBoxText *_cbZoneGlob; Gtk::ComboBoxText *_cbZoneGlob;
Gtk::Entry *_txtNtpServer; Gtk::Entry *_txtNtpServer;
Gtk::MessageDialog *_mess_dchp; Gtk::Window *_mess_dchp;
Gtk::Popover *_popCalendar; Gtk::Popover *_popCalendar;
Gtk::Calendar *_cldrDate; Gtk::Calendar *_cldrDate;
unsigned int year, month, day; unsigned int year, month, day;

Loading…
Cancel
Save