Applications
/
libublsettingsui-gtk3
8
0
Fork 1
Code Issues 6 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'Updated status messages for library update' (#78) from YanTheKaller/libublsettingsui-gtk3:master into master

Browse Source 
Reviewed-on: #78
pull/82/head^2 v1.70
Dmitry Razumov 2 months ago
parent 8dbc9e1c48 9bf06b20ba
commit abbc2409ec
4 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File

1
libublsettingsui-gtk3-filechooser.glade
Unescape View File

@ -134,6 +134,7 @@
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="receives-default">True</property> <property name="receives-default">True</property>
<property name="image">image2</property> <property name="image">image2</property>
<accelerator key="Return" signal="clicked"/>
<style> <style>
<class name="marginright"/> <class name="marginright"/>
</style> </style>

122
libublsettingsui-gtk3.glade
Unescape View File

@ -144,69 +144,77 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkBox" id="mainStatusBox"> <object class="GtkRevealer">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="transition-type">slide-up</property>
<property name="reveal-child">True</property>
<child> <child>
<object class="GtkImage" id="mainStatusIcon"> <object class="GtkBox" id="mainStatusBox">
<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> <child>
<property name="margin-right">5</property> <object class="GtkImage" id="mainStatusIcon">
<property name="margin-start">5</property> <property name="visible">True</property>
<property name="margin-end">5</property> <property name="can-focus">False</property>
<property name="margin-top">5</property> <property name="margin-left">5</property>
<property name="margin-bottom">5</property> <property name="margin-right">5</property>
<property name="pixel-size">25</property> <property name="margin-start">5</property>
</object> <property name="margin-end">5</property>
<packing> <property name="margin-top">5</property>
<property name="expand">False</property> <property name="margin-bottom">5</property>
<property name="fill">True</property> <property name="pixel-size">25</property>
<property name="position">0</property> </object>
</packing> <packing>
</child> <property name="expand">False</property>
<child> <property name="fill">True</property>
<object class="GtkLabel" id="mainStatusLabel"> <property name="position">0</property>
<property name="visible">True</property> </packing>
<property name="can-focus">False</property> </child>
<property name="halign">start</property> <child>
<property name="margin-left">5</property> <object class="GtkLabel" id="mainStatusLabel">
<property name="margin-right">5</property> <property name="visible">True</property>
<property name="margin-start">5</property> <property name="can-focus">False</property>
<property name="margin-end">5</property> <property name="halign">start</property>
<property name="margin-top">6</property> <property name="margin-left">5</property>
<property name="margin-bottom">6</property> <property name="margin-right">5</property>
<property name="wrap">True</property> <property name="margin-start">5</property>
<property name="xalign">0</property> <property name="margin-end">5</property>
<attributes> <property name="margin-top">6</property>
<attribute name="weight" value="bold"/> <property name="margin-bottom">6</property>
<attribute name="foreground" value="#4d4d4d4d4d4d"/> <property name="wrap">True</property>
</attributes> <property name="xalign">0</property>
</object> <attributes>
<packing> <attribute name="weight" value="bold"/>
<property name="expand">False</property> <attribute name="foreground" value="#4d4d4d4d4d4d"/>
<property name="fill">True</property> </attributes>
<property name="position">1</property> </object>
</packing> <packing>
</child> <property name="expand">False</property>
<child> <property name="fill">True</property>
<object class="GtkImage" id="ModeStatusImage"> <property name="position">1</property>
<property name="visible">True</property> </packing>
<property name="can-focus">False</property> </child>
<property name="margin-start">5</property> <child>
<property name="margin-end">5</property> <object class="GtkImage" id="ModeStatusImage">
<property name="margin-top">5</property> <property name="visible">True</property>
<property name="margin-bottom">5</property> <property name="can-focus">False</property>
<property name="pixel-size">25</property> <property name="margin-start">5</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.statemode-yellow-symbolic</property> <property name="margin-end">5</property>
<property name="icon_size">6</property> <property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="pixel-size">25</property>
<property name="icon-name">com.ublinux.libublsettingsui-gtk3.statemode-yellow-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">2</property>
</packing>
</child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">2</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>

10
source/libublsettingsui-gtk3-save.c
Unescape View File

@ -194,14 +194,14 @@ void yon_save_window_set_status(template_saving_window *window,char *path,YON_CO
window->type=type; window->type=type;
window->custom_save_path=path; window->custom_save_path=path;
if (type==YON_CONFIG_BOTH){ if (type==YON_CONFIG_BOTH){
yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_GLOBAL_LOCAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SAVING_GLOBAL_LOCAL_STATE_LABEL,0,BACKGROUND_IMAGE_INFO_TYPE);
} else if (type==YON_CONFIG_GLOBAL){ } else if (type==YON_CONFIG_GLOBAL){
yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_GLOBAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SAVING_GLOBAL_STATE_LABEL,0,BACKGROUND_IMAGE_INFO_TYPE);
} else if (type==YON_CONFIG_LOCAL){ } else if (type==YON_CONFIG_LOCAL){
yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_LOCAL_STATE_LABEL,BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SAVING_LOCAL_STATE_LABEL,0,BACKGROUND_IMAGE_INFO_TYPE);
} else if (type==YON_CONFIG_CUSTOM){ } else if (type==YON_CONFIG_CUSTOM){
yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"savingTarget",SAVING_CUSTOM_STATE_LABEL(path),BACKGROUND_IMAGE_INFO_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),SAVING_CUSTOM_STATE_LABEL(path),0,BACKGROUND_IMAGE_INFO_TYPE);
} }
textdomain(template_app_information.app_locale); textdomain(template_app_information.app_locale);
} }
@ -639,7 +639,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
template_saving_window *yon_exit_window_new(){ template_saving_window *yon_exit_window_new(){
template_saving_window *window = yon_saving_window_new(); template_saving_window *window = yon_saving_window_new();
yon_ubl_status_box_spawn_infinite(GTK_CONTAINER(window->StatusBox),"remove_status",UNSAVED_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),UNSAVED_LABEL,0,BACKGROUND_IMAGE_FAIL_TYPE);
gtk_button_set_label(GTK_BUTTON(window->SaveButton),EXIT_LABEL); gtk_button_set_label(GTK_BUTTON(window->SaveButton),EXIT_LABEL);
g_signal_handlers_disconnect_by_func(G_OBJECT(window->SaveButton), G_CALLBACK(on_save_parameters),window); g_signal_handlers_disconnect_by_func(G_OBJECT(window->SaveButton), G_CALLBACK(on_save_parameters),window);
g_signal_handlers_disconnect_by_func(G_OBJECT(window->ToggleCell), G_CALLBACK(on_save_window_parameter_switched),window); g_signal_handlers_disconnect_by_func(G_OBJECT(window->ToggleCell), G_CALLBACK(on_save_window_parameter_switched),window);

8
source/libublsettingsui-gtk3.c
Unescape View File

@ -618,9 +618,9 @@ template_main_window *yon_ubl_window_setup(){
void yon_on_email_check(GtkEntry *self,GdkEventFocus *event,GtkContainer *status){ void yon_on_email_check(GtkEntry *self,GdkEventFocus *event,GtkContainer *status){
char *text = (char*)gtk_entry_get_text(self); char *text = (char*)gtk_entry_get_text(self);
if (!strstr(text,"@")){ if (!strstr(text,"@")){
yon_ubl_status_box_spawn_infinite(status,"invalid_email",EMAIL_INVALID_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(status,EMAIL_INVALID_LABEL,0,BACKGROUND_IMAGE_FAIL_TYPE);
} else { } else {
yon_ubl_status_box_despawn_infinite(status); yon_ubl_status_box_despawn(status);
} }
} }
@ -670,9 +670,9 @@ void yon_on_path_check(GtkEntry *self,GdkEventFocus *event,GtkContainer *status)
text = new_text; text = new_text;
} }
if (!strstr(text,"/")){ if (!strstr(text,"/")){
yon_ubl_status_box_spawn_infinite(status,"invalid_path",PATH_INVALID_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(status,PATH_INVALID_LABEL,0,BACKGROUND_IMAGE_FAIL_TYPE);
} else { } else {
yon_ubl_status_box_despawn_infinite(status); yon_ubl_status_box_despawn(status);
} }
} }

Write Preview
Loading…
Cancel
Save