Merge pull request 'master' (#133) from YanTheKaller/ubl-settings-datetime:master into master

Reviewed-on: #133

Makefile

@@ -11,7 +11,7 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
 DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
-FILE_VER = source/${PKGNAME}.h
+FILE_VER = source/${PKGNAME}.cc
 PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
 
 default_target: all

source/main.cc

@@ -10,8 +10,8 @@ int main(int argc, char* argv[]) {
     }  
     if (geteuid() != 0){
         string cmd = "";
-        cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
+        // cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
-        return system(cmd.c_str());
+        // return system(cmd.c_str());
     }
     setlocale(LC_ALL, "");
     bindtextdomain("ubl-settings-datetime", "/usr/share/locale/");
@@ -25,7 +25,7 @@ int main(int argc, char* argv[]) {
         
         pars_flag(3, argc, argv);
         auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
-        auto builder = Gtk::Builder::create_from_file(path_glade);
+        auto builder = Gtk::Builder::create_from_resource(path_glade);
         Glib::init();
         setlocale(LC_ALL, "");
         Glib::OptionContext context;

source/ubl-settings-datetime.cc

@@ -13,7 +13,7 @@ bool flag_load_global = false;
 bool flag_sync_hwclock = false;
 int socket_ext_id_I = 0;
 int socket_trd_id_I = 0;
-string version_application = "";
+string version_application;
 MainWindow* obj_main;
 void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) {
     if (self && user_data) {}

ubl-settings-datetime.glade

@@ -91,7 +91,6 @@
     <property name="window-position">center</property>
     <property name="icon-name">com.ublinux.ubl-settings-datetime</property>
     <property name="type-hint">dialog</property>
-    <property name="skip-taskbar-hint">True</property>
     <property name="urgency-hint">True</property>
     <property name="program-name">ubl-settings-datetime</property>
     <property name="version">1.0</property>
@@ -1313,7 +1312,6 @@ Format: DD.MM.YYYY</property>
   </object>
   <object class="GtkWindow" id="windowMessDchp">
     <property name="can-focus">False</property>
-    <property name="valign">start</property>
     <property name="resizable">False</property>
     <child>
       <object class="GtkBox">
@@ -1414,12 +1412,8 @@ Format: DD.MM.YYYY</property>
     </child>
   </object>
   <object class="GtkApplicationWindow" id="wndShowWeb">
+    <property name="width-request">450</property>
     <property name="can-focus">False</property>
-    <property name="halign">start</property>
-    <property name="valign">start</property>
-    <property name="resizable">False</property>
-    <property name="default-width">450</property>
-    <property name="default-height">250</property>
     <property name="icon-name">dialog-question-symbolic</property>
     <child>
       <object class="GtkBox">