diff --git a/Makefile b/Makefile index fb9cff4..2aa17b3 100644 --- a/Makefile +++ b/Makefile @@ -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; \ diff --git a/com.ublinux.libublsettingsui-gtk3.config-full-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-full-symbolic.svg rename to com.ublinux.libublsettingsui-gtk3.config-changes-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-hdd-home-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-hdd-home-symbolic.svg rename to com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-home-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-hdd-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-hdd-symbolic.svg rename to com.ublinux.libublsettingsui-gtk3.config-sandbox-hdd-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.config-ram-home-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg similarity index 100% rename from com.ublinux.libublsettingsui-gtk3.config-ram-home-symbolic.svg rename to com.ublinux.libublsettingsui-gtk3.config-sandbox-ram-home-symbolic.svg diff --git a/com.ublinux.libublsettingsui-gtk3.important.svg b/com.ublinux.libublsettingsui-gtk3.important.svg index 9a90dba..ff8d4b3 100644 --- a/com.ublinux.libublsettingsui-gtk3.important.svg +++ b/com.ublinux.libublsettingsui-gtk3.important.svg @@ -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 @@ + 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" /> diff --git a/libublsettingsui-gtk3-saving.glade b/libublsettingsui-gtk3-saving.glade index ecdfc20..eaa648b 100644 --- a/libublsettingsui-gtk3-saving.glade +++ b/libublsettingsui-gtk3-saving.glade @@ -90,6 +90,8 @@ True True liststore1 + horizontal + 3 none @@ -125,13 +127,13 @@ - + True fixed Old value - - 150 + + 250 4 @@ -142,12 +144,12 @@ - + autosize New value - - 150 + + 250 4 diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index 574751c..4a366ab 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -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){ diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index b0402d4..8c6320b 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -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;