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

Renames, improvements

Browse Source
pull/8/head
Ivan Dmitrievich Yartsev 2 years ago
parent b5d1295025
commit d2415b9c15
9 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File

8
Makefile
Unescape View File

@ -124,12 +124,12 @@ install: check
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.important.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-full-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-changes-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-module-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-ram-home-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-hdd-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-hdd-home-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-ram-home-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-hdd-symbolic.svg"
@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/actions/" "com.ublinux.${PKGNAME}.config-sandbox-hdd-home-symbolic.svg"
@if [ -z ${DESTDIR} ]; then \
[ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
update-desktop-database --quiet &>/dev/null || true; \

0
com.ublinux.libublsettingsui-gtk3.config-full-symbolic.svg → com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
com.ublinux.libublsettingsui-gtk3.config-hdd-home-symbolic.svg → com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
com.ublinux.libublsettingsui-gtk3.config-hdd-symbolic.svg → com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

0
com.ublinux.libublsettingsui-gtk3.config-ram-home-symbolic.svg → com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

8
com.ublinux.libublsettingsui-gtk3.important.svg
Unescape View File

@ -4,7 +4,7 @@
id="svg2"
version="1.1"
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
sodipodi:docname="warning.svg"
sodipodi:docname="com.ublinux.libublsettingsui-gtk3.important.svg"
width="24"
height="24"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@ -37,12 +37,12 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1027"
inkscape:window-height="1023"
id="namedview8"
showgrid="false"
inkscape:zoom="18.96875"
inkscape:cx="5.4827018"
inkscape:cy="9.3047776"
inkscape:cy="9.3311367"
inkscape:current-layer="svg2"
inkscape:pagecheckerboard="0"
inkscape:window-x="0"
@ -51,5 +51,5 @@
<path
id="path4136-2"
style="opacity:1;fill:#4d4d4d;fill-opacity:1"
d="M 11.292969 1.0234375 A 11 11.000002 86.311656 0 0 1.0234375 12.707031 A 11 11.000002 86.311656 0 0 12.707031 22.976562 A 11 11.000002 86.311656 0 0 22.976562 11.292969 A 11 11.000002 86.311656 0 0 11.292969 1.0234375 z M 11.996094 6 L 12.003906 6 C 12.556173 6 13 6.4439 13 6.9960938 L 13 14.003906 C 13 14.556325 12.556173 15 12.003906 15 L 11.996094 15 C 11.443827 15 11 14.556325 11 14.003906 L 11 6.9960938 C 11 6.4439 11.443827 6 11.996094 6 z M 12 17 C 12.554 17 13 17.446 13 18 C 13 18.554 12.554 19 12 19 C 11.446 19 11 18.554 11 18 C 11 17.446 11.446 17 12 17 z " />
d="M 11.292969,22.976562 A 11.000002,11 3.688344 0 1 1.0234375,11.292969 11.000002,11 3.688344 0 1 12.707031,1.0234375 11.000002,11 3.688344 0 1 22.976562,12.707031 11.000002,11 3.688344 0 1 11.292969,22.976562 Z M 11.996094,18 h 0.0078 C 12.556173,18 13,17.5561 13,17.003906 V 9.9960935 c 0,-0.552419 -0.443827,-0.996094 -0.996094,-0.996094 h -0.0078 C 11.443827,8.9999995 11,9.4436745 11,9.9960935 V 17.003906 C 11,17.5561 11.443827,18 11.996094,18 Z M 12,6.9999995 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 z" />
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

14
libublsettingsui-gtk3-saving.glade
Unescape View File

@ -90,6 +90,8 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="model">liststore1</property>
<property name="enable-grid-lines">horizontal</property>
<property name="tooltip-column">3</property>
<child internal-child="selection">
<object class="GtkTreeSelection">
<property name="mode">none</property>
@ -125,13 +127,13 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<object class="GtkTreeViewColumn" id="OldValueColumn">
<property name="resizable">True</property>
<property name="sizing">fixed</property>
<property name="title" translatable="yes">Old value</property>
<child>
<object class="GtkCellRendererText">
<property name="wrap-width">150</property>
<object class="GtkCellRendererText" id="OldValueCell">
<property name="wrap-width">250</property>
</object>
<attributes>
<attribute name="cell-background">4</attribute>
@ -142,12 +144,12 @@
</object>
</child>
<child>
<object class="GtkTreeViewColumn">
<object class="GtkTreeViewColumn" id="NewValueColumn">
<property name="sizing">autosize</property>
<property name="title" translatable="yes">New value</property>
<child>
<object class="GtkCellRendererText">
<property name="wrap-width">150</property>
<object class="GtkCellRendererText" id="NewValueCell">
<property name="wrap-width">250</property>
</object>
<attributes>
<attribute name="cell-background">4</attribute>

27
source/libublsettingsui-gtk3.c
Unescape View File

@ -5,7 +5,7 @@ static char *__yon_config_mode=NULL;
char *yon_ubl_save_mode_get_icon_name(SAVE_MODE_TYPE type){
switch (type){
case SAVE_MODE_FULL:
return "com.ublinux.libublsettingsui-gtk3.config-full-symbolic";
return "com.ublinux.libublsettingsui-gtk3.config-changes-symbolic";
break;
case SAVE_MODE_MODULE:
return "com.ublinux.libublsettingsui-gtk3.config-module-symbolic";
@ -14,13 +14,13 @@ char *yon_ubl_save_mode_get_icon_name(SAVE_MODE_TYPE type){
return "com.ublinux.libublsettingsui-gtk3.config-sandbox-symbolic";
break;
case SAVE_MODE_RAM_HOME:
return "com.ublinux.libublsettingsui-gtk3.config-ram-home-symbolic";
return "com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic";
break;
case SAVE_MODE_HDD:
return "com.ublinux.libublsettingsui-gtk3.config-hdd-symbolic";
return "com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic";
break;
case SAVE_MODE_HDD_HOME:
return "com.ublinux.libublsettingsui-gtk3.config-hdd-home-symbolic";
return "com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic";
break;
}
}
@ -212,6 +212,19 @@ void on_save_parameters(GtkWidget *self, template_saving_window *window){
on_subwindow_close(self);
}
// void on_column_resize(GtkTreeVieolumn *self,GParamSpec *pspec,GtkCellRenderer *renderer){
// GtkWidget *tree = gtk_tree_view_column_get_tree_view(self);
// GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(tree));
// // g_object_ref(model);
// // gtk_tree_view_set_model(GTK_TREE_VIEW(tree),NULL);
// int width = gtk_tree_view_column_get_width(self);
// GValue *val=g_malloc0(sizeof(GValue));
// g_object_get_property(G_OBJECT(renderer),"wrap-width",val);
// g_value_set_int(val,width);
// g_object_set_property(G_OBJECT(renderer),"wrap-width",val);
// gtk_tree_view_set_model(GTK_TREE_VIEW(tree),model);wC
// }
template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
if (((type==YON_CONFIG_LOCAL&& template_config->load_mode==1)||(type==YON_CONFIG_GLOBAL&& template_config->load_mode==0))){
yon_config_save_registered(path);
@ -295,6 +308,10 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
window->CancelButton = yon_gtk_builder_get_widget(builder,"CancelButton");
window->ToggleCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"ToggleCell"));
window->list = GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1"));
window->OldValueColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"OldValueColumn"));
window->OldValueCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"OldValueCell"));
window->NewValueColumn = GTK_TREE_VIEW_COLUMN(gtk_builder_get_object(builder,"NewValueColumn"));
window->NewValueCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"NewValueCell"));
window->type=type;
window->filteredModel = GTK_TREE_MODEL(gtk_builder_get_object(builder,"listfilter1"));
gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(window->filteredModel),5);
@ -307,6 +324,8 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
g_signal_connect(G_OBJECT(window->SaveButton),"clicked", G_CALLBACK(on_save_parameters),window);
g_signal_connect(G_OBJECT(window->ToggleCell),"toggled", G_CALLBACK(on_save_window_parameter_switched),window);
// g_signal_connect(G_OBJECT(window->OldValueColumn),"notify::width",G_CALLBACK(on_column_resize),window->OldValueCell);
// g_signal_connect(G_OBJECT(window->NewValueColumn),"notify::width",G_CALLBACK(on_column_resize),window->NewValueCell);
int config_size=0;
config_str config_strings = yon_config_get_all(&config_size);
if (config_strings){

4
source/libublsettingsui-gtk3.h
Unescape View File

@ -177,6 +177,10 @@ typedef struct {
GtkWidget *SaveButton;
GtkListStore *list;
GtkTreeModel *filteredModel;
GtkTreeViewColumn *OldValueColumn;
GtkCellRenderer *OldValueCell;
GtkTreeViewColumn *NewValueColumn;
GtkCellRenderer *NewValueCell;
YON_CONFIG_TYPE type;
} template_saving_window;

Write Preview
Loading…
Cancel
Save