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

Options menu redesigned

Browse Source
pull/9/head
Ivan Dmitrievich Yartsev 3 years ago
parent 0f282f191c
commit f44a61d101
4 changed files with 1220 additions and 1068 deletions
Show Stats Download Patch File Download Diff File

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

@ -282,11 +282,12 @@ int on_settings_accept(GtkWidget *button, dictionary **widgetsDs){
void on_paned_move(GtkPaned* self, GtkScrollType* scroll_type, actionWidgets *widgets){ /* TODO */
int position=gtk_paned_get_position(GTK_PANED(widgets->GnomePaned));
if (position<250) {position=250; gtk_paned_set_position(GTK_PANED(widgets->GnomePaned),250);}
main_config.iconSegmentSize=position;
if (position <115) position=115;
if (position <115) {position=115;}
double pos=((double)position-(11/(double)position*4)*500)/1.3;
if (pos<110) pos=110;
//printf("Paned moved to %f\n",pos);
printf("Paned moved to %f\n",pos);
for (dictionary *dict=widgets->ICSys;dict!=NULL;dict=dict->next){
IVGraphicals *IV=(IVGraphicals*)dict->data;
gtk_icon_view_set_item_width(GTK_ICON_VIEW(IV->IV),pos);
@ -1490,7 +1491,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview");
curWidgets->socket=GTK_WIDGET(create_socket(curWidgets));
// curWidgets->MenuItemAboutSystem=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"MenuItemAboutSystem"));
g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "clicked", G_CALLBACK(on_about_system),curWidgets);
g_signal_connect(G_OBJECT(curWidgets->MenuItemAboutSystem), "activate", G_CALLBACK(on_about_system),curWidgets);
if (curWidgets->ButtonBackToMain!=NULL)
gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings"));
gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager");
@ -1523,7 +1524,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
curWidgets->helpText=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"helpText"));
curWidgets->settingsSizeInfoLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSizeInfoLabel"));
curWidgets->settingsIcon=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsIcon"));
curWidgets->settingsSectionsSettingsButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSectionsSettingsButton"));
// curWidgets->settingsSectionsSettingsButton=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSectionsSettingsButton"));
curWidgets->SectionSettingsWindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsWindow"));
curWidgets->SectionSettingsPack=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"SectionSettingsPack"));
curWidgets->settingsSizeSlider=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsSizeSlider"));
@ -1546,8 +1547,8 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
gtk_window_resize(GTK_WINDOW(curWidgets->window),main_config.windowWidth,main_config.windowHeight);
gtk_window_set_icon_from_file(GTK_WINDOW(curWidgets->window),AppIconPath,NULL);
gtk_window_set_icon_from_file(GTK_WINDOW(curWidgets->SectionSettingsWindow),AppIconPath,NULL);
g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "clicked", G_CALLBACK(on_ButtonOpenHelp_activated), curWidgets->builder);
g_signal_connect(G_OBJECT(curWidgets->MenuItemSettings), "clicked", G_CALLBACK(on_settingsOpen), curWidgets);
g_signal_connect(G_OBJECT(curWidgets->MenuItemDocumentation), "activate", G_CALLBACK(on_ButtonOpenHelp_activated), curWidgets->builder);
g_signal_connect(G_OBJECT(curWidgets->MenuItemSettings), "activate", G_CALLBACK(on_settingsOpen), curWidgets);
if (gnld==0){
gnld=1;
@ -1558,7 +1559,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
g_signal_connect(G_OBJECT(curWidgets->settingsSizeSlider), "value-changed", G_CALLBACK(on_settings_icon_size_changed), curWidgets);
g_signal_connect(G_OBJECT(curWidgets->settingsCancel), "clicked", G_CALLBACK(on_settings_cancel), curWidgets);
g_signal_connect(G_OBJECT(curWidgets->settingsAccept), "clicked", G_CALLBACK(on_settings_accept), widgetss);
g_signal_connect(G_OBJECT(curWidgets->settingsSectionsSettingsButton), "clicked", G_CALLBACK(on_section_settings_open), widgets);
// g_signal_connect(G_OBJECT(curWidgets->settingsSectionsSettingsButton), "clicked", G_CALLBACK(on_section_settings_open), widgets);
g_signal_connect(G_OBJECT(curWidgets->SectionSettingAddButton), "clicked", G_CALLBACK(on_sections_add), curWidgets);
g_signal_connect(G_OBJECT(curWidgets->SectionSettingsClearEntryButton), "clicked", G_CALLBACK(on_sections_new_clear), curWidgets);
g_signal_connect(G_OBJECT(curWidgets->SectionSettingsCloseButton), "clicked", G_CALLBACK(on_sections_close), curWidgets);
@ -1575,11 +1576,11 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
gtk_button_set_label(GTK_BUTTON(curWidgets->settingsCancel),_("Close"));
gtk_button_set_label(GTK_BUTTON(curWidgets->settingsAccept),_("Save and apply"));
gtk_button_set_label(GTK_BUTTON(curWidgets->AlwaysOpenDocumentation),_("Always redirect"));
gtk_button_set_label(GTK_BUTTON(curWidgets->MenuItemSettings),_("Settings"));
gtk_button_set_label(GTK_BUTTON(curWidgets->MenuItemDocumentation),_("About..."));
gtk_button_set_label(GTK_BUTTON(curWidgets->MenuItemAboutSystem),_("About system"));
gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemSettings),_("Settings"));
gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemDocumentation),_("About..."));
gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemAboutSystem),_("About system"));
gtk_button_set_label(GTK_BUTTON(curWidgets->CautionUnderstandButton),_("Understood"));
gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),_("Section management"));
// gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),_("Section management"));
return widgets;
}
@ -1664,7 +1665,7 @@ int main(int argc, char *argv[]){
yon_icv_resize_item(widg->ICSys,widg->GnomePaned);
}
if (geteuid()==0){
gtk_widget_set_sensitive(widg->settingsSectionsSettingsButton,1);
// gtk_widget_set_sensitive(widg->settingsSectionsSettingsButton,1);
}
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("Standard theme"));
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widg->settingsThemeChooser),NULL,_("GNOME theme"));
@ -1688,7 +1689,7 @@ int main(int argc, char *argv[]){
gtk_css_provider_load_from_path(css,CssPath,NULL);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
GTK_STYLE_PROVIDER(css),
0);
-1);
gtk_main();
}

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

@ -131,7 +131,7 @@ typedef struct {
GtkWidget *GnomePaned;
GtkWidget *GnomeInfoLabel;
GtkWidget *workingwindow;
GtkWidget *settingsSectionsSettingsButton;
// GtkWidget *settingsSectionsSettingsButton;
GtkWidget *SectionSettingsWindow;
GtkWidget *SectionSettingsPack;
dictionary *SettingsSections;

82
ubl-settings-manager.css
Unescape View File

@ -29,4 +29,84 @@ background-color: #404040;
}
.noborder {
border: none;
}
}
.menuitembottom{
margin-top:0px;
margin-bottom:0px;
border-color:alpha(@theme_text_color, 0.4);
border-style:solid;
border-radius:0 0 5px 5px;
border-left-width:1px;
border-bottom-width:1px;
border-right-width:1px;
}
.menuitemmiddle{
margin-top:0px;
margin-bottom:0px;
border-color:alpha(@theme_text_color, 0.4);
border-style:solid;
border-left-width:1px;
border-right-width:1px;
}
.menuitemtop{
margin-bottom:0px;
border-color:alpha(@theme_text_color, 0.4);
border-style:solid;
border-radius:5px 5px 0 0;
border-left-width:1px;
border-top-width:1px;
border-right-width:1px;
}
.menuitemtop *{
margin:2px 2px 0 2px;
padding: 5px 10px 3px 5px;
}
.menuitemmiddle *{
margin:0 2px 0 2px;
padding: 3px 10px 3px 5px;
}
.menuitembottom *{
margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px;
}
.menuitemtop:hover {
background:@theme_bg_color;
}
.menuitemmiddle:hover {
background:@theme_bg_color;
}
.menuitembottom:hover {
background:@theme_bg_color;
}
.menuitemtop:hover* {
margin:2px 2px 0 2px;
padding: 5px 10px 3px 5px;
background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent;
}
.menuitemmiddle:hover* {
margin:0 2px 0 2px;
padding: 3px 10px 3px 5px;
background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent;
}
.menuitembottom:hover* {
margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px;
background:@theme_selected_bg_color;
border-radius:2px;
border-color:transparent;
}
.menu {
background:transparent;
}
.workingbg {
background-color:@theme_base_color;
}
.workingbg.view.cell:selected{
background-color:@theme_selected_bg_color;
}

2177
ubl-settings-manager.glade
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save