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

New functionality

Browse Source
pull/2/head
Ivan Dmitrievich Yartsev 3 years ago
parent a4e83ec566
commit 43d3f48715
8 changed files with 3246 additions and 62 deletions
Show Stats Download Patch File Download Diff File

15
.config/ubconfig-main/ubconfig-main.conf
Unescape View File

@ -0,0 +1,15 @@
[window]
WindowPosX=0
WindowPosY=0
WindowWidth=1920
WindowHeight=1004
WindowTheme=1
IconSize=2
IconSegmentSize=152
[sections]
Personal=XFCE;
Hardware=X-UBL-SettingsManager;X-UBL-HardwareSettings;
System=X-UBL-SettingsManager;X-UBL-SystemSettings;
Misc=X-UBL-SettingsManager;X-UBL-PersonalSettings;
Xfce Настройки=X-XFCE-SettingsDialog;

9
.gitignore vendored
Unescape View File

@ -0,0 +1,9 @@
.vscode/
config.conf
ubconfig-main-back.conf
gtk-dark.css
msgformat.py
calendarApp.glade
calendarApp.glade~
ubl-settings-manager.glade~
ubl-settings-manager-bin

22
css/gtk-widgets.css
Unescape View File

@ -30,10 +30,28 @@ background-color: #404040;
} }
iconview:disabled { #Icon {
background-color: rgba(0,0,0,0); background-color: transparent;
color: transparent;
}
iconview#GnomeIcon{
border-style:solid;
border-bottom-width: 1px;
border-image: linear-gradient(90deg, #aaaaaa 0%, #dcddde 100%);
border-image-slice: 1;
background-color: transparent;
} }
#noborders{ #noborders{
border-style:solid; border-style:solid;
border: 0px; border: 0px;
} }
label#iconlabel {
font-size:14px;
font-weight: bold;
}
#combo{
text-align:center;
}

95
ubl-settings-manager.c
Unescape View File

@ -12,6 +12,7 @@
#include <unistd.h> #include <unistd.h>
#include <pthread.h> #include <pthread.h>
#include<sys/utsname.h> #include<sys/utsname.h>
#include<sys/sysinfo.h>
#include "ubl-settings-manager.h" #include "ubl-settings-manager.h"
@ -1007,11 +1008,14 @@ IVGraphicals *yon_create_single_section_IV(char *name,char *cats){
IVGraphicals *IVG=malloc(sizeof(IVGraphicals)); IVGraphicals *IVG=malloc(sizeof(IVGraphicals));
GtkWidget *box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); GtkWidget *box=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
GtkWidget *iv=gtk_icon_view_new(); GtkWidget *iv=gtk_icon_view_new();
GtkWidget *label=gtk_label_new(_(name));
gtk_widget_set_name(label,"iconlabel");
if (main_config.WindowTheme==1) { if (main_config.WindowTheme==1) {
gtk_icon_view_set_columns(GTK_ICON_VIEW(iv),1); gtk_icon_view_set_columns(GTK_ICON_VIEW(iv),1);
gtk_widget_set_name(iv,"GnomeIcon");
gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL); gtk_icon_view_set_item_orientation(GTK_ICON_VIEW(iv),GTK_ORIENTATION_HORIZONTAL);
} }
GtkWidget *label=gtk_label_new(_(name));
GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); GtkWidget *sep=gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
GtkListStore *lv=gtk_list_store_new(2, GDK_TYPE_PIXBUF,G_TYPE_STRING); GtkListStore *lv=gtk_list_store_new(2, GDK_TYPE_PIXBUF,G_TYPE_STRING);
gtk_widget_set_halign(box,0); gtk_widget_set_halign(box,0);
@ -1149,6 +1153,9 @@ SectionSettingSegment *yon_create_section_setting(char *name, char *categories){
segment->DeleditBox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0); segment->DeleditBox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
segment->ButtonDelete=gtk_button_new_from_icon_name("edit-delete",GTK_ICON_SIZE_BUTTON); segment->ButtonDelete=gtk_button_new_from_icon_name("edit-delete",GTK_ICON_SIZE_BUTTON);
gtk_widget_set_name(segment->NameLabel,"SegName");
gtk_widget_set_name(segment->CategoriesLabel,"SegCat");
gtk_container_add(GTK_CONTAINER(segment->MainFrame),segment->MainBox); gtk_container_add(GTK_CONTAINER(segment->MainFrame),segment->MainBox);
gtk_box_pack_start(GTK_BOX(segment->MainBox),segment->DragButtonBox,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(segment->MainBox),segment->DragButtonBox,FALSE,FALSE,0);
@ -1158,9 +1165,9 @@ SectionSettingSegment *yon_create_section_setting(char *name, char *categories){
gtk_box_pack_start(GTK_BOX(segment->DragButtonBox),segment->DragDownButton,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(segment->DragButtonBox),segment->DragDownButton,FALSE,FALSE,0);
gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->NameBox,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->NameBox,FALSE,FALSE,0);
gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->CategoriesBox,FALSE,FALSE,0); gtk_box_pack_end(GTK_BOX(segment->ElemBox),segment->CategoriesBox,FALSE,FALSE,0);
gtk_box_pack_start(GTK_BOX(segment->ElemBox),segment->OptionBox,FALSE,FALSE,0); gtk_box_pack_start(GTK_BOX(segment->MainBox),segment->OptionBox,FALSE,FALSE,0);
gtk_box_pack_start(GTK_BOX(segment->NameBox),segment->NameEntry,FALSE,FALSE,5); gtk_box_pack_start(GTK_BOX(segment->NameBox),segment->NameEntry,FALSE,FALSE,5);
gtk_box_pack_start(GTK_BOX(segment->NameBox),segment->NameLabel,FALSE,FALSE,5); gtk_box_pack_start(GTK_BOX(segment->NameBox),segment->NameLabel,FALSE,FALSE,5);
@ -1186,29 +1193,33 @@ SectionSettingSegment *yon_create_section_setting(char *name, char *categories){
gtk_widget_set_margin_top(segment->DragButtonBox,3); gtk_widget_set_margin_top(segment->DragButtonBox,3);
gtk_widget_set_margin_end(segment->DragUpButton,3); gtk_widget_set_margin_end(segment->DragUpButton,3);
gtk_widget_set_halign(segment->ElemBox,GTK_ALIGN_FILL); // gtk_widget_set_halign(segment->ElemBox,GTK_ALIGN_FILL);
gtk_widget_set_halign(segment->NameBox,GTK_ALIGN_START); // gtk_widget_set_halign(segment->NameBox,GTK_ALIGN_START);
gtk_widget_set_halign(segment->CategoriesBox,GTK_ALIGN_START); // gtk_widget_set_halign(segment->CategoriesBox,GTK_ALIGN_START);
gtk_widget_set_halign(segment->NameEntry,GTK_ALIGN_START); gtk_widget_set_halign(segment->NameEntry,GTK_ALIGN_START);
gtk_widget_set_halign(segment->NameLabel,GTK_ALIGN_START); gtk_widget_set_halign(segment->NameLabel,GTK_ALIGN_END);
gtk_widget_set_halign(segment->CategoriesEntry,GTK_ALIGN_START); // gtk_widget_set_halign(segment->CategoriesEntry,GTK_ALIGN_START);
gtk_widget_set_halign(segment->CategoriesLabel,GTK_ALIGN_START); // gtk_widget_set_halign(segment->CategoriesLabel,GTK_ALIGN_START);
gtk_widget_set_halign(segment->EditButtonAccept,GTK_ALIGN_END); // gtk_widget_set_halign(segment->EditButtonAccept,GTK_ALIGN_END);
gtk_widget_set_halign(segment->EditButtonBox,GTK_ALIGN_END); // gtk_widget_set_halign(segment->EditButtonBox,GTK_ALIGN_END);
gtk_widget_set_halign(segment->EditButtonCancel,GTK_ALIGN_END); // gtk_widget_set_halign(segment->EditButtonCancel,GTK_ALIGN_END);
gtk_widget_set_halign(segment->ButtonEdit,GTK_ALIGN_END); // gtk_widget_set_halign(segment->ButtonEdit,GTK_ALIGN_END);
gtk_widget_set_valign(segment->ElemBox,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->ElemBox,GTK_ALIGN_CENTER);
gtk_widget_set_valign(segment->NameBox,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->NameBox,GTK_ALIGN_CENTER);
gtk_widget_set_valign(segment->CategoriesBox,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->CategoriesBox,GTK_ALIGN_CENTER);
gtk_widget_set_valign(segment->NameEntry,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->NameEntry,GTK_ALIGN_START);
gtk_widget_set_valign(segment->NameLabel,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->NameLabel,GTK_ALIGN_START);
gtk_widget_set_valign(segment->CategoriesEntry,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->CategoriesEntry,GTK_ALIGN_CENTER);
gtk_widget_set_valign(segment->CategoriesLabel,GTK_ALIGN_CENTER); // gtk_widget_set_valign(segment->CategoriesLabel,GTK_ALIGN_CENTER);
gtk_widget_set_valign(segment->OptionBox,GTK_ALIGN_CENTER);
gtk_widget_set_hexpand(segment->ElemBox,1); gtk_label_set_xalign(GTK_LABEL(segment->NameLabel),0);
gtk_widget_set_hexpand(segment->CategoriesEntry,1); gtk_label_set_xalign(GTK_LABEL(segment->CategoriesLabel),0);
gtk_widget_set_hexpand(segment->CategoriesLabel,1); // gtk_widget_set_hexpand(segment->ElemBox,1);
// gtk_widget_set_hexpand(segment->NameEntry,1);
// gtk_widget_set_hexpand(segment->NameLabel,1);
// gtk_widget_set_hexpand(segment->CategoriesEntry,1);
// gtk_widget_set_hexpand(segment->CategoriesLabel,1);
gtk_widget_set_vexpand(segment->ElemBox,0); gtk_widget_set_vexpand(segment->ElemBox,0);
@ -1294,19 +1305,27 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_
curWidgets->workingwindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"workingwindow"))); curWidgets->workingwindow=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"workingwindow")));
curWidgets->icvpack=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"icvpack"))); curWidgets->icvpack=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"icvpack")));
curWidgets->GnomePaned=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Paned"))); curWidgets->GnomePaned=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Paned")));
curWidgets->GnomeInfoLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"Paned"))); curWidgets->GnomeInfoLabel=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,yon_char_get_augumented(theme_id,"InfoLabel")));
curWidgets->SettingsSections=NULL; curWidgets->SettingsSections=NULL;
gtk_style_context_add_class(gtk_widget_get_style_context(curWidgets->icvpack),"iconview");
if (curWidgets->GnomeInfoLabel!=NULL){ if (curWidgets->GnomeInfoLabel!=NULL){
struct utsname sysinfo; struct utsname sysinfos;
uname(&sysinfo); uname(&sysinfos);
struct seq_file *fl; printf("System Name = %s\n", sysinfos.sysname);
show_cpuinfo(fl); printf("Node Name = %s\n", sysinfos.nodename);
printf("System Name = %s\n", sysinfo.sysname); printf("Version = %s\n", sysinfos.version);
printf("Node Name = %s\n", sysinfo.nodename); printf("Release = %s\n", sysinfos.release);
printf("Version = %s\n", sysinfo.version); printf("Machine = %s\n", sysinfos.machine);
printf("Release = %s\n", sysinfo.release); struct sysinfo info;
printf("Machine = %s\n", sysinfo.machine); sysinfo(&info);
char lbl[2000];
memset(lbl,0,2000);
sprintf(lbl,"Система: %s\nЯдро: %s %s %s\nВремя работы: %\n\nОперативная память: %f/%f",sysinfos.sysname,sysinfos.machine,sysinfos.sysname,sysinfos.release,info.uptime/60/60,info.totalram/1024/1024,info.freeram/1024/1024);
gtk_label_set_text(GTK_LABEL(curWidgets->GnomeInfoLabel),lbl);
printf("\n\n%d\n\n",info.totalram/1024/1024);
printf("\n\n%d\n\n",info.freeram/1024/1024);
} }
if (curWidgets->ButtonBackToMain!=NULL) if (curWidgets->ButtonBackToMain!=NULL)
gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings")); gtk_button_set_label(GTK_BUTTON(curWidgets->ButtonBackToMain),_("Back to settings"));
@ -1316,8 +1335,10 @@ dictionary *yon_theme_new(dictionary *widgets, GtkBuilder *builder, char *theme_
g_signal_connect(G_OBJECT(curWidgets->ButtonBackToMain), "clicked", G_CALLBACK(on_backToSettingsButton_clicked), curWidgets); g_signal_connect(G_OBJECT(curWidgets->ButtonBackToMain), "clicked", G_CALLBACK(on_backToSettingsButton_clicked), curWidgets);
curWidgets->LabelTitle=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"LabelTitle")); curWidgets->LabelTitle=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"LabelTitle"));
gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager GNOME"); gtk_window_set_title(GTK_WINDOW(curWidgets->window),"UBLinux Settings Manager GNOME");
if (curWidgets->GnomePaned!=NULL) if (curWidgets->GnomePaned!=NULL){
g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets); g_signal_connect(G_OBJECT(curWidgets->GnomePaned), "notify::position", G_CALLBACK(on_paned_move), curWidgets);
}
// Standard for all themes // Standard for all themes
curWidgets->settingsThemeChooser=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsThemeChooser")); curWidgets->settingsThemeChooser=GTK_WIDGET(gtk_builder_get_object(curWidgets->builder,"settingsThemeChooser"));
@ -1424,7 +1445,7 @@ int main(int argc, char *argv[]){
gtk_css_provider_load_from_path(css,CssPath,NULL); gtk_css_provider_load_from_path(css,CssPath,NULL);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
GTK_STYLE_PROVIDER(css), GTK_STYLE_PROVIDER(css),
GTK_STYLE_PROVIDER_PRIORITY_USER); 0);
gtk_main(); gtk_main();
} }

39
ui/forTest.glade~
Unescape View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkWindow">
<property name="can-focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">label</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>
</interface>

1589
ui/ubl-settings-manager backup 1.glade~
View File

File diff suppressed because it is too large Load Diff

1468
ui/ubl-settings-manager backup.glade~
View File

File diff suppressed because it is too large Load Diff

49
ui/ubl-settings-manager.glade
Unescape View File

@ -361,7 +361,6 @@
<object class="GtkAlignment"> <object class="GtkAlignment">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="left-padding">12</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -369,13 +368,18 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkComboBoxText" id="settingsThemeChooser"> <object class="GtkComboBoxText" id="settingsThemeChooser">
<property name="name">combo</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="margin-start">10</property>
<property name="margin-end">10</property> <property name="margin-end">10</property>
<property name="margin-bottom">5</property>
<property name="hexpand">True</property>
<property name="active">0</property> <property name="active">0</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
@ -398,32 +402,50 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="label-xalign">0</property>
<property name="shadow-type">in</property>
<child>
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkButton" id="settingsSectionsSettingsButton"> <object class="GtkButton" id="settingsSectionsSettingsButton">
<property name="label" translatable="yes">Настройка разделов</property> <property name="label" translatable="yes">Настройка разделов</property>
<property name="visible">True</property> <property name="visible">True</property>
<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="halign">center</property> <property name="margin-start">10</property>
<property name="margin-end">10</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> </object>
<placeholder/> </child>
</object>
</child>
<child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Тонкая настройка</property>
</object>
</child> </child>
</object> </object>
<packing> <packing>
@ -639,7 +661,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="halign">center</property> <property name="halign">center</property>
<property name="margin-end">5</property> <property name="margin-end">3</property>
<property name="image">image2</property> <property name="image">image2</property>
</object> </object>
<packing> <packing>
@ -652,7 +674,6 @@
<object class="GtkEntry" id="SectionSettingsAddNameEntry"> <object class="GtkEntry" id="SectionSettingsAddNameEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
<property name="margin-end">5</property>
<property name="truncate-multiline">True</property> <property name="truncate-multiline">True</property>
<property name="caps-lock-warning">False</property> <property name="caps-lock-warning">False</property>
<property name="placeholder-text" translatable="yes">Название группы</property> <property name="placeholder-text" translatable="yes">Название группы</property>
@ -678,6 +699,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="receives-default">True</property> <property name="receives-default">True</property>
<property name="margin-end">5</property>
<property name="image">image4</property> <property name="image">image4</property>
</object> </object>
<packing> <packing>
@ -699,7 +721,7 @@
<property name="margin-left">5</property> <property name="margin-left">5</property>
<property name="margin-right">5</property> <property name="margin-right">5</property>
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">10</property>
<property name="caps-lock-warning">False</property> <property name="caps-lock-warning">False</property>
<property name="placeholder-text" translatable="yes">Идетификатор</property> <property name="placeholder-text" translatable="yes">Идетификатор</property>
</object> </object>
@ -978,7 +1000,10 @@
<object class="GtkLabel" id="GnomeInfoLabel"> <object class="GtkLabel" id="GnomeInfoLabel">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">fsdfhsdftj</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

Write Preview
Loading…
Cancel
Save