reverting

Makefile

@@ -6,51 +6,48 @@ MAKEFILE_DIR := $(notdir $(patsubst %/,%,$(dir $(MAKEFILE_FILEPATH))))
 MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))
 
 CMAKE_COMMAND = cmake
-CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
-CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-DEPENDS = /bin/cmake
-PREFIX ?= /usr/local
+#CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
+#CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
+CMAKE_SOURCE_DIR = ./source
+CMAKE_BUILD_DIR = ./compile
+DEPENDS = cmake
 PKGNAME = $(MAKEFILE_DIR)
-FILE_VER = source/${PKGNAME}.h
+#PKGNAME = ubl-settings-manager
+pkgdir =
 
 default_target: all
 
-.PHONY: all init depend debug prepare check build uninstall install clean help
-
 all: init build
 
 init:
 	@echo "Initialize ..."; \
-	if [ -d ".git" ]; then \
-	    LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
-	else \
-	    LATEST_TAG="Development"; \
-	fi; \
-	sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \
+  	version="$$(cat VERSION.md)"; \
+	version=$${version:8}; \
+	search="s/char *version_application.*$&"; \
+	replace="char *version_application = \"$${version}\";"; \
+	sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
   	echo "-- Build path: ${CMAKE_BUILD_DIR}"
         
 depend:
-	@echo "Check depends ..."
-	@for FILE_DEPEND in $(DEPENDS); do \
-	    if [ ! -f $${FILE_DEPEND} ]; then \
-		echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \
+	@echo "Check depends ..."; \
+	if [ ! -f /bin/cmake ]; then \
+	    echo "-- Depend 'cmake' not found !"; \
 	    exit 1; \
 	fi; \
-	done; \
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \
 	echo "Check depends: OK"
+#	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 
 debug:
 	@echo "Debug ..."
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
+	    cmake -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \
 	fi; \
 	echo "Debug: OK"
 
 prepare:
 	@echo "Prepare ..."; \
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
+	    cmake -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \
 	fi; \
 	echo "Prepare: OK"
 
@@ -65,64 +62,75 @@ check:
 
 build: depend prepare
 	@echo "Build ..."; \
-	$(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \
-	sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \
+	make --directory=${CMAKE_BUILD_DIR}; \
 	echo "Build: OK"
 
 uninstall:
 	@echo "Uninstall ..."
-	@for FILE_PO in $(wildcard *.po); do \
-	    LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-	    FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-	    $(RM) "$${PATH_FILE_MO}"; \
-	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
-	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
-	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
+	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.svg"; \
+	    $(RM) "/usr/share/"${pkgname}"/images/${PKGNAME}.png"; \
 	done
 	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
-	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
+	        $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	done
-	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
-	@$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
-	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
-	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"
-	@if [ -z ${DESTDIR} ]; then \
-	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
-	    update-desktop-database --quiet &>/dev/null || true; \
-	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
-	fi
+	@for FILE_PO in $(wildcard *.po); do \
+	    LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
+	    FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
+	    PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	    $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	done
+	@$(RM) "/usr/bin/${PKGNAME}"
+	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
+	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.png"
+	@$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg"
+	@$(RM) "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg"
+	@$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
+	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade"
+	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
+	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png"
+	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
+	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
+	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
+	@$(RM) -d "/usr/share/${PKGNAME}/css"
+	@$(RM) -d "/usr/share/${PKGNAME}/ui"
+	@$(RM) -d "/usr/share/${PKGNAME}"
+	@$(RM) "/etc/ubconfig-main.conf"
+	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
+	@update-desktop-database --quiet 2>/dev/null
+	@touch /usr/share/applications
 	@echo "Uninstall: OK"
 
 install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
 		LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-		install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
+		install -dm755 /usr/share/locale/$${LANG}/LC_MESSAGES; \
 		FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-		PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-		echo "$${FILE_PO}"; \
+		PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+		echo  $${FILE_PO}; \
 		msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16 32 48; do \
-		install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+		install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \
+		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \
 	done
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
-	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
-	@install -Dm744 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@sed -e 's+/usr/bin+${PREFIX}/bin+g' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy
-	@if [ -z ${DESTDIR} ]; then \
-	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
-	    update-desktop-database --quiet &>/dev/null || true; \
-	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
-	fi
+	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg
+	@install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} 
+	@install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop
+	@install -Dm755 /usr/share/${PKGNAME}/ -d ui
+	@install -Dm755 /usr/share/${PKGNAME}/ -d css
+	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade
+	@install -Dm644 -t /usr/share/${PKGNAME}/css/ ${PKGNAME}.css
+	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ublinux-logo.svg
+	@install -Dm644 -t /etc/ ubconfig-main.conf
+	@chmod 766 /etc/ubconfig-main.conf
+	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}-banner.png 
+	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
+	@update-desktop-database --quiet 2>/dev/null 
+	@touch /usr/share/applications
 	@echo "Install: OK"
 
 clean:
@@ -135,12 +143,12 @@ clean:
 	fi
 
 help:
-	@echo "The following are some of the valid targets for this Makefile:"; \
-	echo "... all (the default if no target is provided)"; \
-	echo "... init"; \
-	echo "... debug"; \
-	echo "... prepare"; \
-	echo "... compile"; \
-	echo "... install"; \
-	echo "... uninstall"; \
-	echo "... clean"
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... init"
+	@echo "... debug"
+	@echo "... prepare"
+	@echo "... compile"
+	@echo "... install"
+	@echo "... uninstall"
+	@echo "... clean"

source/CMakeLists.txt

@@ -8,86 +8,18 @@ include_directories(${GTK_INCLUDE_DIRS})
 link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})
 
-#pkg_check_modules(VTE291 REQUIRED vte-2.91)
-#include_directories(${VTE291_INCLUDE_DIRS})
-#link_directories(${VTE291_LIBRARY_DIRS})
-#add_definitions(${VTE291_CFLAGS_OTHER})
-
-find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
-
-option(WEBKIT_FOUND "No" OFF)
-if(WEBKIT_LIBRARIES_FOUND)
-        option(WEBKIT_FOUND "Yes" ON)
-        PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
-        include_directories(${WEBKIT_INCLUDE_DIRS})
-        link_directories(${WEBKIT_LIBRARY_DIRS})
-        add_definitions(${WEBKIT_CFLAGS_OTHER})
-endif()
-
-configure_file(ubl-cmake.in ubl-cmake.h)
-
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ./)
-
-set(GRESOURCE_C   resources.c)
-set(GRESOURCE_XML gresource.xml)
-
-find_program(GLIB_COMPILE_RESOURCES NAMES glib-compile-resources REQUIRED)  
-add_custom_target(GLADE ubl-settings-manager.glade)
-
-set(DEPENDFILES 
-                ../ubl-settings-manager.glade
-                ../gresource.xml
-                ../ubl-settings-manager-banner.png
-                ../ubl-settings-manager.css
-        )
-
-file(COPY ${DEPENDFILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
-add_custom_command(
-    OUTPUT ${GRESOURCE_C}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    COMMAND ${GLIB_COMPILE_RESOURCES}
-    ARGS
-        --generate-source
-        --target=${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
-        ${GRESOURCE_XML}
-    VERBATIM
-    MAIN_DEPENDENCY ${GRESOURCE_XML}
-    DEPENDS
-        ${GLADE}
-)
-add_custom_target(
-    dummy-resource
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
-)
-
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-	-O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection")
-      
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
 
 set(SOURCE_FILES
         ubl-settings-manager.c
-        ubl-settings-manager.h
-        ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h
-        )
+        ubl-settings-manager.h)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
-        ${WEBKIT_LIBRARIES}
-#        ${VTE291_LIBRARIES}
         pthread)
 
 
-add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})
-target_link_libraries(${PROJECT_NAME} PUBLIC ${LIBRARIES})
-target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_BINARY_DIR})
-set_source_files_properties(
-    ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
-    PROPERTIES GENERATED TRUE
-)
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-add_dependencies(${PROJECT_NAME} dummy-resource)
+add_executable(ubl-settings-manager ${SOURCE_FILES})
+target_link_libraries(ubl-settings-manager ${LIBRARIES})
+install(TARGETS ubl-settings-manager DESTINATION bin)

source/ubl-settings-manager.h

@@ -3,58 +3,24 @@
 
 #include <gtk/gtk.h>
 #include <time.h>
-#include <getopt.h>
-#include <dlfcn.h>
-#include "ubl-cmake.h"
-#ifdef WEBKIT_FOUND
-#include <webkit2/webkit2.h>
-#endif
-
-#define UBLINUX_WIKI_COMMAND "xdg-open https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-manager"
-#define UBLINUX_WIKI_LINK " https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-manager"
 
-#define check_web2kit_command "ldconfig -p |grep webkit2"
 
-#define cmdVersionText yon_char_get_augumented(yon_char_get_augumented(_("Version: "),version_application),"\n")
-#define cmdHelpText yon_char_get_augumented(yon_char_get_augumented(_("ubl-settings-manager version: "),version_application),_("\nGTK settings manager for UBLinux\nUsage:  ubl-settings-manager [OPTIONS...]\nOptions:\n  -h, --help		  Show this help\n  -V, --version	  	  Show package version\n      --lock-settings Lock menu settings\n"))
-#define GladePath "/com/ublinux/ui/ubl-settings-manager.glade"
-#define CssPath "/com/ublinux/css/ubl-settings-manager.css"
-#define GlobalConfigPath "/etc/xdg/ubl-settings-manager/ubl-settings-manager.conf"
-#define UserConfigPath "/.config/ubl-settings-manager/ubl-settings-manager.conf"
-#define AppIconPath "com.ublinux.ubl-settings-manager"
-#define AppBannerPath "/com/ublinux/images/ubl-settings-manager-banner.png"
+#define GladePath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager.glade"
+#define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
+#define GlobalConfigPath "/etc/ubconfig-main.conf"
+#define UserConfigPath "/.config/ubl-settings-manager/ubconfig-main.conf"
+#define AppIconPath "ubl-settings-manager"
+#define AppBannerPath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager-banner.png"
 #define DesktopPath "/usr/share/applications/"
 #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/"
+#define ErrIconPicturePath "/usr/share/icons/Faenza/emblems/32/emblem-important.png"
+#define ublinux_logo "/usr/share/ubl-settings-manager/ui/ublinux-logo.svg"
 #define LocalePath "/usr/share/locale" 
 #define LocaleName "ubl-settings-manager"
+#define LogoPath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-manager.svg"
 #define ubl_settings_infoPath "ubl-settings-info"
 #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
-typedef char* string;
-string version_application;
-
-#define UBL_SETTINGS_MANAGER_TITLE _("UBLinux Settings Manager")
-#define UBL_SETTINGS_MANAGER_ABOUT_TITLE _("About UBLinux Settings Manager")
-#define ABOUT_PROJECT_HOME_PAGE_LABEL _("Project Home Page")
-#define ABOUT_PROJECT_COMMENTS_LABEL _("Settings manager for UBLinux")
-#define CONFIG_LOAD_ERROR _("Config loading failed!\n")
-#define DOUBLE_CLICK_SELECTION_LABEL _("Double click selection")
-#define SECTIONS_MANAGEMENT_LABEL _("Sections management")
-#define UNDERSTOOD_LABEL _("Understood")
-#define ABOUT_LABEL _("About...")
-#define DOCUMENTATION_LABEL _("Documentation")
-#define SETTINGS_LABEL _("Settings")
-#define ALWAYS_REDIRECT_LABEL _("Always redirect")
-#define APPLY_LABEL _("Apply")
-#define SAVE_AND_APPLY_LABEL _("Save and apply")
-#define CLOSE_LABEL _("Close")
-#define CANCEL_LABEL _("Cancel")
-#define READ_ONLINE_LABEL _("Read online")
-#define REDIRECTION_COMMENT_LABEL _("You will be redirected to documentation site, where user help pages are translated and supported by community.")
-#define REDIRECTION_LABEL _("Would you like to read documentation in the Web?")
-#define WINDOW_THEME_LABEL _("Window theme")
-#define ICON_SIZE_LABEL _("Icon size")
-#define BACK_TO_ALL_SETTINGS_LABEL _("All settings")
-
+char *version_application = "1.3";
 
 typedef struct apps{
         char *Name;
@@ -114,12 +80,6 @@ typedef struct {
     char *lastUser;
     int changed;
     int fullscreen;
-    int lock_settings;
-    int GnomeDoubleClick;
-    int MainDoubleClick;
-    int *currentDoubleClick;
-    dictionary *SettingsSections;
-    int BannerHidden;
 } config;
 
 typedef struct {
@@ -177,7 +137,7 @@ typedef struct {
     GtkWidget *GnomePaned;
     GtkWidget *GnomeInfoLabel;
     GtkWidget *workingwindow;
-    GtkWidget *settingsSectionsSettingsButton;
+    // GtkWidget *settingsSectionsSettingsButton;
     GtkWidget *SectionSettingsWindow;
     GtkWidget *SectionSettingsPack;
     dictionary *SettingsSections;
@@ -199,13 +159,6 @@ typedef struct {
     apps *applist;
     GtkWidget *icvpack;
     GtkWidget *infoWarningWindow;
-    GtkWidget *infoWarningButton;
-    GtkWidget *infoWarningLabel;
-    GtkWidget *BannerRevealer;
-    GtkWidget *Revealer;
-    GtkWidget *settingsDoubleClickSwitch;
-    GtkWidget *settingsDoubleClickLabel;
-    GtkWidget *BackToSettingsLabel;
     
 } actionWidgets;
 
@@ -244,13 +197,11 @@ void sort_apps(apps *applist,int size);
 apps *find_apps(int *sizef);
 int check_categories(apps app, char *catstocheck);
 int setup_config();
-void update_double_clicks(dictionary *widgetsD);
-void yon_icv_resize_item(dictionary *icdict, GtkWidget *paned);
 dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *theme_id, apps *applist, int appsize);
 char *yon_char_get_augumented(char *source, char *append);
 char *yon_cut(char *source, int size, int startpos);
 int yon_set_sections(IconSection *section);
-void yon_set_default_sections(dictionary *section);
+void yon_set_default_sections(dictionary **section);
 char *yon_char_divide_search(char *source, char* dividepos, int delete_divider);
 char *yon_char_divide(char *source, int dividepos);
 dictionary *yon_section_new(dictionary *section, char *section_name, char *categories);
@@ -258,12 +209,6 @@ void yon_switch_theme(dictionary **dict, dictionary *newone);
 dictionary *yon_dictionary_find(dictionary **dict, char *key);
 void yon_segment_show(actionWidgets *widgets, SectionSettingSegment *sgm);
 dictionary *yon_dictionary_create_empty();
-dictionary *yon_dictionary_rip(dictionary *dict);
-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);
@@ -271,6 +216,7 @@ void yon_dictionary_make_first(dictionary *dict);
 dictionary *yon_create_icon_section_list(dictionary *sections);
 int yon_show_icon_views(dictionary *IVS,actionWidgets *widgets);
 void yon_icon_size_convert(int mode);
+void on_about_system(GtkWidget *button, actionWidgets *widgets);
 char *yon_char_new(char *chr);
 int launch(thread_output *thread);
 float yon_time_average(dictionary *times);
@@ -278,6 +224,5 @@ void yon_time_reg_for_average(dictionary *listofregs, int size, time_t tm);
 void yon_dictionary_switch_to_last(dictionary **dict);
 dictionary *yon_dictionary_create_conneced(dictionary *targetdict);
 int yon_get_icon_size(int size);
-char *yon_char_from_int(int int_to_convert);
 
 #endif