pull/97/head
parent 60178fe08a
commit 854e299a8c

@ -115,7 +115,7 @@ void on_toggle_button_toggled(GtkWidget *self, main_window *widgets){
if (!repo_net) repo_net = ",db"; if (!repo_net) repo_net = ",db";
else repo_net = yon_char_unite(repo_net,",","db",NULL); else repo_net = yon_char_unite(repo_net,",","db",NULL);
}else { }else {
repo_net = yon_char_unite(repo_net,",",NULL); // repo_net = yon_char_unite(repo_net,",",NULL);
} }
} else { } else {
repo_net = "disable"; repo_net = "disable";
@ -123,7 +123,7 @@ void on_toggle_button_toggled(GtkWidget *self, main_window *widgets){
if (!repo_net) repo_net = ",db"; if (!repo_net) repo_net = ",db";
else repo_net = yon_char_unite(repo_net,",","db",NULL); else repo_net = yon_char_unite(repo_net,",","db",NULL);
} else { } else {
repo_net = yon_char_unite(repo_net,",",NULL); // repo_net = yon_char_unite(repo_net,",",NULL);
} }
} }
if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->PublicationCheck))){ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->PublicationCheck))){
@ -131,6 +131,7 @@ void on_toggle_button_toggled(GtkWidget *self, main_window *widgets){
} else { } else {
char *repos = ""; char *repos = "";
GtkTreeIter iter; GtkTreeIter iter;
int disabled_count=0;
for_iter(GTK_TREE_MODEL(widgets->PublicationList),&iter){ for_iter(GTK_TREE_MODEL(widgets->PublicationList),&iter){
char *target; char *target;
int status; int status;
@ -139,9 +140,11 @@ void on_toggle_button_toggled(GtkWidget *self, main_window *widgets){
char *temp = yon_char_unite(repos,!yon_char_is_empty(repos)?",":"",target,NULL); char *temp = yon_char_unite(repos,!yon_char_is_empty(repos)?",":"",target,NULL);
if (!yon_char_is_empty(repos)) free(repos); if (!yon_char_is_empty(repos)) free(repos);
repos = temp; repos = temp;
} else {
disabled_count++;
} }
} }
if (!yon_char_is_empty(repos)){ if (!yon_char_is_empty(repos)&&disabled_count){
repo_net = yon_char_unite(repo_net,",",repos,NULL); repo_net = yon_char_unite(repo_net,",",repos,NULL);
} }
} }
@ -217,6 +220,12 @@ void yon_interface_update(main_window *widgets){
hour = atoi(time_parsed[0]); hour = atoi(time_parsed[0]);
minute = atoi(time_parsed[1]); minute = atoi(time_parsed[1]);
GDateTime *datetime = g_date_time_new_utc(year,month,day,hour,minute,0.0); GDateTime *datetime = g_date_time_new_utc(year,month,day,hour,minute,0.0);
if (yon_char_is_empty(main_config.date_format)){
yon_window_config_get_parameter("settings","date_format",&main_config.date_format,YON_TYPE_STRING);
if (yon_char_is_empty(main_config.date_format)){
main_config.date_format="%d.%m.%Y %H:%M";
}
}
char *time_label = g_date_time_format(datetime,main_config.date_format); char *time_label = g_date_time_format(datetime,main_config.date_format);
gtk_entry_set_text(GTK_ENTRY(widgets->DateEntry),time_label); gtk_entry_set_text(GTK_ENTRY(widgets->DateEntry),time_label);
g_date_time_unref(datetime); g_date_time_unref(datetime);
@ -591,9 +600,6 @@ void config_init(){
main_config.lock_save_local=0; main_config.lock_save_local=0;
main_config.load_mode=1; main_config.load_mode=1;
main_config.date_format=NULL; main_config.date_format=NULL;
if (!yon_window_config_get_parameter("usage","date_format",&main_config.date_format,YON_TYPE_STRING)){
main_config.date_format="%d.%m.%Y %H:%M";
}
} }
@ -1626,7 +1632,6 @@ web_publication_add_window *yon_web_publication_add_window_new(){
window->SelectionCellRenderer = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"SelectionCellRenderer")); window->SelectionCellRenderer = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"SelectionCellRenderer"));
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(window->UserPasswordEntry)); yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(window->UserPasswordEntry));
yon_gtk_entry_block_restricted_symbols(GTK_ENTRY(window->PathEntry));
yon_gtk_entry_block_restricted_symbols(GTK_ENTRY(window->UsernameEntry)); yon_gtk_entry_block_restricted_symbols(GTK_ENTRY(window->UsernameEntry));
window->name=NULL; window->name=NULL;
g_signal_connect(G_OBJECT(window->SelectionCellRenderer),"toggled",G_CALLBACK(on_cell_renderer_toggle_toggled),window->RepositoriesTree); g_signal_connect(G_OBJECT(window->SelectionCellRenderer),"toggled",G_CALLBACK(on_cell_renderer_toggle_toggled),window->RepositoriesTree);

@ -100,6 +100,7 @@
<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">Storage path to publish</property> <property name="tooltip-text" translatable="yes">Storage path to publish</property>
<property name="input-purpose">url</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

Loading…
Cancel
Save