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

Merge pull request 'master' (#79) from YanTheKaller/libublsettingsui-gtk3:master into master

Browse Source 
Reviewed-on: #79
pull/82/head^2 v1.71
Dmitry Razumov 2 months ago
parent abbc2409ec 041306e48e
commit e8ed8dce5d
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
libublsettingsui-gtk3-password.glade
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.40.0 -->
<interface domain="ubl-settings-update">
<interface domain="libublsettingsui-gtk3">
<requires lib="gtk+" version="3.24"/>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
@ -166,7 +166,6 @@
</child>
<child>
<object class="GtkProgressBar" id="PasswordStrengthProgress">
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
@ -278,7 +277,6 @@
<child>
<object class="GtkEntry" id="PasswordHashEntry">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes">Password hash</property>
<property name="visibility">False</property>
@ -342,7 +340,7 @@
</child>
<child>
<object class="GtkButton" id="UserOkButton">
<property name="label" translatable="yes">Accept</property>
<property name="label" translatable="yes">Ok</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>

3
libublsettingsui-gtk3.pot
Unescape View File

@ -487,3 +487,6 @@ msgstr ""
#: source/libublsettingsui-gtk3.h:728
msgid "User"
msgstr ""
msgid "Open configuration file"
msgstr ""

3
libublsettingsui-gtk3_ru.po
Unescape View File

@ -496,3 +496,6 @@ msgstr "Группа"
#: source/libublsettingsui-gtk3.h:728
msgid "User"
msgstr "Пользователь"
msgid "Open configuration file"
msgstr "Открыть файл конфигурации"

17
source/libublsettingsui-gtk3-password.c
Unescape View File

@ -129,10 +129,9 @@ void on_password_hash_sensitiveness(GtkWidget *,yon_password_window *window){
const char *hash = gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry));
const char *hash_command = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->EncryptionCombo));
if (!yon_char_is_empty(hash_command)){
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->NoEncriptionCheck),1);
gtk_widget_set_sensitive(window->NoEncriptionCheck,0);
} else {
gtk_widget_set_sensitive(window->NoEncriptionCheck,1);
} else {
gtk_widget_set_sensitive(window->NoEncriptionCheck,0);
}
if (!yon_char_is_empty(password)||!yon_char_is_empty(repeat_password)){
gtk_widget_set_sensitive(window->HashBox,0);
@ -153,8 +152,12 @@ void on_password_hash_sensitiveness(GtkWidget *,yon_password_window *window){
}
}
void on_password_changed(GtkWidget *, yon_password_window *window);
void yon_password_function_set(yon_password_window *window, double *password_func){
window->strength_func = password_func;
g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_changed),window);
gtk_widget_show(window->PasswordStrengthProgress);
}
void on_password_accept(GtkWidget *,dictionary *dict){
@ -183,13 +186,16 @@ void on_password_accept(GtkWidget *,dictionary *dict){
}
void on_password_changed(GtkWidget *, yon_password_window *window){
const char *password_str = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
double strength = ((double(*)(yon_password_window *,const char*))window->strength_func)(window,password_str);
if (window->strength_func){
const char *password_str = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
double strength = ((double(*)(yon_password_window *,const char*))window->strength_func)(window,password_str);
}
}
yon_password_window *yon_password_window_new(){
GtkBuilder *builder = gtk_builder_new_from_resource(ui_glade_path_password);
yon_password_window *window = malloc(sizeof(yon_password_window));
memset(window,0,sizeof(yon_password_window));
window->Window = yon_gtk_builder_get_widget(builder,"PasswordWindow");
window->HeadLabel = yon_gtk_builder_get_widget(builder,"userTitleNameLabel");
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
@ -210,7 +216,6 @@ yon_password_window *yon_password_window_new(){
g_signal_connect(G_OBJECT(window->NoEncriptionCheck),"toggled",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->PasswordHashEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_changed),window);
g_signal_connect(G_OBJECT(window->RepeatPasswordEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
gtk_widget_show(window->Window);
return window;

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

@ -511,8 +511,8 @@ char *yon_custom_config_init(GtkFileChooserAction type){
filechooser_window *dialog = yon_config_file_chooser_window_new(type);
gtk_widget_hide(dialog->ChooseFolderCheck);
yon_gtk_window_setup(GTK_WINDOW(dialog->Window),NULL,template_app_information.app_title,yon_char_unite("com.ublinux.",template_app_information.app_tech_name,NULL),"ConfigFilechooserWindow");
gtk_label_set_text(GTK_LABEL(dialog->HeaderTopic),template_app_information.app_title);
yon_gtk_window_setup(GTK_WINDOW(dialog->Window),NULL,OPEN_CONFIGURATION_FILE_LABEL,yon_char_unite("com.ublinux.",template_app_information.app_tech_name,NULL),"ConfigFilechooserWindow");
gtk_label_set_text(GTK_LABEL(dialog->HeaderTopic),OPEN_CONFIGURATION_FILE_LABEL);
if (type==GTK_FILE_CHOOSER_ACTION_SAVE){
// yon_file_chooser_set_button_label(yon_char_get_localised_from_lib(LOAD_CONFIG_LABEL));

1
source/libublsettingsui-gtk3.h
Unescape View File

@ -641,6 +641,7 @@ yon_window *yon_window_new();
#define CANCEL_LABEL yon_char_get_localised_from_lib("Cancel")
#define ACCEPT_LABEL yon_char_get_localised_from_lib("Ok")
#define OPEN_LABEL yon_char_get_localised_from_lib("Open")
#define OPEN_CONFIGURATION_FILE_LABEL yon_char_get_localised_from_lib("Open configuration file")
#define CREATE_FOLDER_LABEL yon_char_get_localised_from_lib("Create directory")
#define SELECT_FOLDER_LABEL yon_char_get_localised_from_lib("Select directory")

Write Preview
Loading…
Cancel
Save