Applications
/
ubl-settings-manager
9
0
Fork 1
Code Issues 17 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'devel' (#37) from devel into master

Browse Source 
Reviewed-on: YanTheKaller/ubl-settings-manager#37
pull/37/head
Ivan Dmitrievich Yartsev 3 years ago
parent ebf09fa6c8 1e37e87854
commit 9d36522338
5 changed files with 55 additions and 40 deletions
Show Stats Download Patch File Download Diff File

67
source/ubl-settings-manager.c
Unescape View File

@ -360,7 +360,7 @@ void on_section_settings_open(GtkButton* self,dictionary *cWidgets){
main_config.SettingsSections->first->key=name;
yon_segments_hide(widgets);
yon_segment_show(widgets, (SectionSettingSegment*)main_config.SettingsSections->data);
for (dictionary *dct=main_config.sections->first->next;dct!=NULL;dct=dct->next){ // ошибка если меньше двух
for (dictionary *dct=main_config.sections->first->next;dct!=NULL;dct=dct->next){
name=((IconSection*)dct->data)->section;
categories=((IconSection*)dct->data)->categories;
main_config.SettingsSections=yon_dictionary_create_with_data_connected(main_config.SettingsSections,name,yon_create_section_setting(name, categories));
@ -495,7 +495,7 @@ void on_sections_add(GtkWidget *button, actionWidgets *widgets){
SectionSettingSegment *segment=yon_create_section_setting(category_name,category_categories);
dictionary *newsection = yon_dictionary_get_last(main_config.SettingsSections);
newsection=yon_dictionary_create_with_data_connected(newsection,category_name,segment);
printf("%s\n",category_name);
// printf("%s\n",category_name);
dictionary *newsec=yon_dictionary_create_empty();
newsec=yon_section_new(newsec,category_name,category_categories);
main_config.sections=yon_dictionary_create_with_data_connected(main_config.sections,category_name,newsec->data);
@ -656,6 +656,7 @@ void on_reveal_banner(GtkWidget *button, actionWidgets *widgets){
}
void on_double_click_changed(GtkWidget *Switch, gboolean state, dictionary *widgetsD){
// printf("%s\n","SGRBHSDRFJHNSDRJHNSDRJHNDRDJR");
*main_config.currentDoubleClick=state;
update_double_clicks(widgetsD);
}
@ -724,14 +725,23 @@ int reload_list(IVGraphicals *section){
}
void update_double_clicks(dictionary *widgetsD){
printf("%s\n","1");
for (dictionary *dict=widgetsD->first;dict!=NULL;dict=dict->next){
printf("%s\n","2");
actionWidgets *widgets=(actionWidgets*)dict->data;
printf("%s\n","3");
for (dictionary *ivdct=widgets->ICSys->first;ivdct!=NULL;ivdct=ivdct->next){
printf("%s\n","4");
IVGraphicals *IV=(IVGraphicals*)ivdct->data;
if (strcmp(dict->key,"Gnome")==0)
printf("%s\n","5");
if (strcmp(dict->key,"Gnome")==0){
printf("%s\n","6");
gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(IV->IV),!main_config.GnomeDoubleClick);
else
printf("%s\n","7");
} else{
gtk_icon_view_set_activate_on_single_click(GTK_ICON_VIEW(IV->IV),!main_config.MainDoubleClick);
printf("%s\n","8");
}
}
}
}
@ -988,13 +998,15 @@ void save_config(actionWidgets *widgets){
int sz=1,szm=1;
if (main_config.Gnomeiconsize==64) sz=4;
if (main_config.Gnomeiconsize==48) sz=3;
if (main_config.Gnomeiconsize==32) sz=2;
if (main_config.Gnomeiconsize==24) sz=1;
else if (main_config.Gnomeiconsize==48) sz=3;
else if (main_config.Gnomeiconsize==32) sz=2;
else if (main_config.Gnomeiconsize==24) sz=1;
else sz=3;
if (main_config.Mainiconsize==64) szm=4;
if (main_config.Mainiconsize==48) szm=3;
if (main_config.Mainiconsize==32) szm=2;
if (main_config.Mainiconsize==24) szm=1;
else if (main_config.Mainiconsize==48) szm=3;
else if (main_config.Mainiconsize==32) szm=2;
else if (main_config.Mainiconsize==24) szm=1;
else szm=3;
char *fromint=malloc(5);
memset(fromint,0,5);
GError *err=NULL;
@ -1077,11 +1089,8 @@ char *yon_char_divide_search(char *source, char* dividepos, int delete_divider){
void yon_set_default_sections(dictionary *section){
yon_section_new(section,"Personal","X-UBL-SettingsManager;X-UBL-PersonalSettings;");
section=yon_dictionary_create_conneced(section);
yon_section_new(section,"Hardware","X-UBL-SettingsManager;X-UBL-HardwareSettings;");
section=yon_dictionary_create_conneced(section);
yon_section_new(section,"System","X-UBL-SettingsManager;X-UBL-SystemSettings;");
section=yon_dictionary_create_conneced(section);
yon_section_new(section,"Misc","X-UBL-SettingsManager;X-UBL-MiscSettings;");
}
@ -1175,21 +1184,18 @@ void yon_check_path(char *path){
}
dictionary *yon_section_new(dictionary *section, char *section_name, char *categories){
section->next=NULL;
IconSection *sct=malloc(sizeof(IconSection));
dictionary *dict=yon_dictionary_create_empty();//malloc(sizeof(dictionary));
sct->section=section_name;
sct->categories=categories;
dict->data=sct;
if (!section->data){
section->data=dict->data;
sct->section=section_name;
sct->categories=categories;
if (!section->data&&!section->prev){
section->data=sct;
section->first=section;
section->key=section_name;
} else {
dict->first=section->first;
section->next=dict;
dict->prev=section;
dict->key=section_name;
section=yon_dictionary_get_last(section);
section->next=yon_dictionary_create_conneced(section);
section->next->data=sct;
section->next->key=section_name;
section=section->next;
}
@ -1272,6 +1278,14 @@ dictionary *yon_dictionary_rip(dictionary *dict){
}
}
dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect){
dictionary *dict=yon_dictionary_get_last(old);
dict->next=toconnect;
toconnect->prev=dict;
toconnect->first=dict->first;
return toconnect;
}
void yon_switch_theme(dictionary **dict, dictionary *newone){
dictionary *dct=*dict;
actionWidgets *widgets=(actionWidgets*)dct->data;
@ -1598,8 +1612,9 @@ dictionary *yon_dictionary_switch_places(dictionary *dict,int aim){
}
dictionary *yon_dictionary_get_last(dictionary *dict){
for (dictionary *dct=dict;dct!=NULL;dct=dct->next){}
return dict;
dictionary *dct=NULL;
for (dct=dict->first;dct->next!=NULL;dct=dct->next){}
return dct;
}
void yon_main_quit(actionWidgets *widgets){

1
source/ubl-settings-manager.h
Unescape View File

@ -229,6 +229,7 @@ dictionary *yon_dictionary_get_last(dictionary *dict);
dictionary *yon_dictionary_switch_places(dictionary *dict,int aim);
dictionary *yon_dictionary_create_with_data(char *key, void *data);
dictionary *yon_dictionary_create_with_data_connected(dictionary *dict, char *key, void *data);
dictionary *yon_dictionary_connect(dictionary *old, dictionary *toconnect);
SectionSettingSegment *yon_create_section_setting(char *name, char *categories);
void yon_segments_show(actionWidgets *widgets);
void yon_segments_hide(actionWidgets *widgets);

3
ubl-settings-manager.conf
Unescape View File

@ -11,6 +11,9 @@ MainLabelSize=12
GnomeLabelSize=12
LabelDensity=0
User=
GnomeDoubleClick=false
MainDoubleClick=true
BannerHidden=false
[sections]
Personal=X-UBL-SettingsManager;X-UBL-PersonalSettings;

2
ubl-settings-manager.desktop
Unescape View File

@ -8,7 +8,7 @@ Comment=ubl-settings-manager
Comment[ru]=Приложение для управления настройками UBLinux
Type=Application
Exec=ubl-settings-manager
Icon=com.ublinux.ubl-settings-manager
Icon=ru.ublinux.ubl-settings-manager
Terminal=false
X-XfcePluggable=false
Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;

22
ubl-settings-manager.glade
Unescape View File

@ -24,7 +24,7 @@
<property name="margin-end">20</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
<property name="icon-name">dialog-question-symbolic</property>
<property name="icon-name">dialog-information-symbolic</property>
<property name="icon_size">6</property>
</object>
<packing>
@ -89,7 +89,7 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="pixel-size">32</property>
<property name="icon-name">dialog-question-symbolic</property>
<property name="icon-name">dialog-information-symbolic</property>
<property name="icon_size">5</property>
</object>
</child>
@ -364,10 +364,6 @@
</object>
</child>
</object>
<object class="GtkSwitch">
<property name="visible">True</property>
<property name="can-focus">True</property>
</object>
<object class="GtkAction" id="action1"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
@ -759,7 +755,7 @@
<property name="can-focus">True</property>
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="direction">left</property>
<property name="direction">right</property>
<child>
<placeholder/>
</child>
@ -1253,8 +1249,8 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkButton" id="SectionSettingsCloseButton">
<property name="label" translatable="yes">Close</property>
<object class="GtkButton" id="SectionSettingsSaveButton">
<property name="label" translatable="yes">Save and apply</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
@ -1269,12 +1265,12 @@
</packing>
</child>
<child>
<object class="GtkButton" id="SectionSettingsSaveButton">
<property name="label" translatable="yes">Save and apply</property>
<object class="GtkButton" id="SectionSettingsCloseButton">
<property name="label" translatable="yes">Close</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="margin-end">17</property>
<property name="margin-end">15</property>
<property name="margin-bottom">5</property>
</object>
<packing>
@ -1372,7 +1368,7 @@
<property name="focus-on-click">False</property>
<property name="receives-default">True</property>
<property name="use-underline">True</property>
<property name="direction">left</property>
<property name="direction">right</property>
<child>
<placeholder/>
</child>

Write Preview
Loading…
Cancel
Save