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

Исправлен дизайн, частично код приведён стандарту Стэнфордского университета

Browse Source
pull/71/head
Igor Belitskiy 3 years ago
parent a223848947
commit 5960598354
5 changed files with 462 additions and 392 deletions
Show Stats Download Patch File Download Diff File

14
source/main.cc
Unescape View File

@ -3,7 +3,7 @@
void pars_flag(int index_start, int argc, char* argv[]); void pars_flag(int index_start, int argc, char* argv[]);
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
string str_argv=""; string str_argv= "";
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]) + " ";
@ -13,11 +13,11 @@ int main(int argc, char* argv[]) {
bindtextdomain("ubl-settings-datetime", "/usr/share/locale/"); bindtextdomain("ubl-settings-datetime", "/usr/share/locale/");
bind_textdomain_codeset("ubl-settings-datetime", "UTF-8"); bind_textdomain_codeset("ubl-settings-datetime", "UTF-8");
textdomain("ubl-settings-datetime"); textdomain("ubl-settings-datetime");
if (argc>1){ if (argc > 1){
str_argv = argv[1]; str_argv = argv[1];
} }
if (str_argv.find("--socket-id")!=std::string::npos){ if (str_argv.find("--socket-id") != std::string::npos){
pars_flag(3, argc, argv); pars_flag(3, argc, argv);
auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug");
@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
app->run(plug); app->run(plug);
return 0; return 0;
} }
else if (str_argv.find("-")!=std::string::npos || argc==1){ else if (str_argv.find("-") != std::string::npos || argc == 1){
int len_argv = 1; int len_argv = 1;
auto app = Gtk::Application::create(len_argv, argv, "org.gtkmm.example.plug"); auto app = Gtk::Application::create(len_argv, 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");
@ -62,10 +62,10 @@ int main(int argc, char* argv[]) {
} }
void pars_flag(int index_start, int argc, char* argv[]){ void pars_flag(int index_start, int argc, char* argv[]){
string str_argv=""; string str_argv = "";
for (int i=index_start; i<argc; i++){ for (int i = index_start; i<argc; i++){
str_argv = argv[i]; str_argv = argv[i];
if (str_argv=="--help" || str_argv=="-h"){ if (str_argv == "--help" || str_argv == "-h"){
help(); help();
exit (1); exit (1);
} }

704
source/ubl-settings-datetime.cc
View File

File diff suppressed because it is too large Load Diff

31
source/ubl-settings-datetime.h
Unescape View File

@ -20,11 +20,11 @@
using namespace std; using namespace std;
extern string path_app; extern const string path_app;
extern string path_glade; extern const string path_glade;
extern string app_name; extern const string app_name;
extern string path_locale; extern const string path_locale;
extern string path_css; extern const string path_css;
extern bool flag_datetime; extern bool flag_datetime;
extern bool flag_timezone; extern bool flag_timezone;
extern bool flag_ntp_mode; extern bool flag_ntp_mode;
@ -105,17 +105,26 @@ class MainWindow : public Gtk::ApplicationWindow {
Gtk::Label *lblHW; Gtk::Label *lblHW;
Gtk::ComboBoxText *cbHw; Gtk::ComboBoxText *cbHw;
Gtk::Box *boxDateTime; Gtk::Box *boxDateTime;
unsigned int year=0; Gtk::Widget *boxButton;
unsigned int month=0; Gtk::Widget *boxSave;
unsigned int day=0; Gtk::Widget *standartHead;
Gtk::Widget *plugBox;
Gtk::Window *window;
Gtk::Image *imgDonwload;
Gtk::Image *imgSave;
Gtk::Image *imgSettings;
unsigned int year = 0;
unsigned int month = 0;
unsigned int day = 0;
string version_application = "1.3"; string version_application = "1.3";
int error_info = 0; int error_info = 0;
int warning_info = 0; int warning_info = 0;
int hour; int hour;
int minute; int minute;
string str_region=""; string str_region = "";
string str_zone=""; string str_zone = "";
bool bool_close_banner_info=true; bool bool_close_banner_info = true;
template<typename Type> template<typename Type>
struct Result{ struct Result{
Type response; Type response;

9
style.css
Unescape View File

@ -70,3 +70,12 @@
.menuitemtop{ .menuitemtop{
margin-bottom:0px; margin-bottom:0px;
} }
.bkim{
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));
}

60
ubl-settings-datetime.glade
Unescape View File

@ -457,7 +457,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-bottom">6</property> <property name="margin-bottom">6</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
@ -550,7 +550,7 @@ Format: DD.MM.YYYY</property>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -680,7 +680,6 @@ Format: DD.MM.YYYY</property>
</child> </child>
<child> <child>
<object class="GtkEntry" id="txtNtpServer"> <object class="GtkEntry" id="txtNtpServer">
<property name="width-request">-1</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes">Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.</property> <property name="tooltip-text" translatable="yes">Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.</property>
@ -754,19 +753,31 @@ Format: DD.MM.YYYY</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="margin-left">8</property> <property name="margin-left">8</property>
<property name="margin-right">31</property> <property name="margin-right">5</property>
<property name="margin-start">8</property> <property name="margin-start">8</property>
<property name="margin-end">31</property> <property name="margin-end">5</property>
<property name="margin-top">6</property> <property name="margin-top">6</property>
<property name="margin-bottom">13</property> <property name="margin-bottom">13</property>
<property name="label" translatable="yes">Synchronize hardware time:</property> <property name="label" translatable="yes">Synchronize hardware time:</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-end">55</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkComboBoxText" id="cbHw"> <object class="GtkComboBoxText" id="cbHw">
<property name="visible">True</property> <property name="visible">True</property>
@ -783,7 +794,7 @@ Format: DD.MM.YYYY</property>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -829,7 +840,6 @@ Format: DD.MM.YYYY</property>
</child> </child>
<child> <child>
<object class="GtkComboBoxText" id="cbRegion"> <object class="GtkComboBoxText" id="cbRegion">
<property name="width-request">172</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
@ -842,7 +852,7 @@ Format: DD.MM.YYYY</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
@ -956,11 +966,11 @@ Format: DD.MM.YYYY</property>
<object class="GtkLabel" id="lblHeader"> <object class="GtkLabel" id="lblHeader">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="halign">start</property>
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-bottom">2</property>
<property name="hexpand">False</property> <property name="hexpand">False</property>
<property name="label" translatable="yes">ubl-settings-datetime</property> <property name="label" translatable="yes">ubl-settings-datetime</property>
<attributes> <attributes>
@ -1014,7 +1024,7 @@ Format: DD.MM.YYYY</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="imgDonwload">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">pan-down-symbolic</property> <property name="icon-name">pan-down-symbolic</property>
@ -1079,7 +1089,7 @@ Format: DD.MM.YYYY</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="imgSave">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">pan-down-symbolic</property> <property name="icon-name">pan-down-symbolic</property>
@ -1109,7 +1119,7 @@ Format: DD.MM.YYYY</property>
<property name="popup">menu1</property> <property name="popup">menu1</property>
<property name="direction">none</property> <property name="direction">none</property>
<child> <child>
<object class="GtkImage"> <object class="GtkImage" id="imgSettings">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="icon-name">open-menu-symbolic</property> <property name="icon-name">open-menu-symbolic</property>
@ -1134,6 +1144,30 @@ Format: DD.MM.YYYY</property>
</object> </object>
</child> </child>
</object> </object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="cbRegion"/>
<widget name="cbZone"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="btnUpdateDateTime"/>
<widget name="lblHW"/>
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">both</property>
<property name="ignore-hidden">True</property>
<widgets>
<widget name="cbHw"/>
<widget name="cbZone"/>
</widgets>
</object>
<object class="GtkPopover" id="popCalendar"> <object class="GtkPopover" id="popCalendar">
<property name="width-request">240</property> <property name="width-request">240</property>
<property name="height-request">185</property> <property name="height-request">185</property>

Write Preview
Loading…
Cancel
Save