diff --git a/.gitignore b/.gitignore
index db6e033..c50c704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
.vscode/
*#
-ubl-settings-TEMPLATE
+ubl-settings-repomanager
*~
build/
compile/
diff --git a/Makefile b/Makefile
index 23b99ae..8fd7e6e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,21 +10,25 @@ CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
#CMAKE_SOURCE_DIR = ./source
#CMAKE_BUILD_DIR = ./compile
-FILE_VERSION = VERSION.md
DEPENDS = /bin/cmake
PREFIX ?= /usr
PKGNAME = $(MAKEFILE_DIR)
#PKGNAME = ubl-settings-manager
-
+LATEST_TAG=
default_target: all
-.PHONY: all init depend debug prepare check build uninstall install clean up_ver help
+.PHONY: all init depend debug prepare check build uninstall install clean help
all: init build
init:
@echo "Initialize ..."; \
- sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-repomanager.h; \
+ if [ -d ".git" ]; then \
+ LATEST_TAG=$$(git describe --tags | sed 's/^v//'|grep -oE "^[0-9]{1,}.[0-9]{1,}"); \
+ else \
+ LATEST_TAG="0.0"; \
+ fi; \
+ sed -r "s/^(string version_application).*/\1=\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
echo "-- Build path: ${CMAKE_BUILD_DIR}"
depend:
@@ -38,11 +42,13 @@ depend:
echo "Check depends: OK"
# $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-debug:
- @echo "Debug ..."
+debug: init build
+ @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}"; \
fi; \
+ echo "${CMAKE_BUILD_DIR}/${PKGNAME}"; \
+ cp ${CMAKE_BUILD_DIR}/${PKGNAME} ./; \
echo "Debug: OK"
prepare:
@@ -88,8 +94,6 @@ uninstall:
@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.checked.svg"
@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.warning.svg"
- @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/${PKGNAME}-banner.png"
- @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
@$(RM) "${DESTDIR}${PREFIX}/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; \
@@ -100,6 +104,9 @@ uninstall:
install: check uninstall
@echo "Install ..."
+#################################################### УДАЛИТЬ ПЕРЕД КОММИТОМ ################################################################################
+ @gcc source/ubl-cmake.h compile/resources.c compile/ubl-cmake.h source/ubl-settings-repomanager.c source/ubl-settings-repomanager.h source/ubl-strings.h source/ubl-utils.c source/ubl-utils.h -o ubl-settings-repomanager `pkg-config --cflags --libs gtk+-3.0 vte-2.91 webkit2gtk-4.0 webkit2gtk-web-extension-4.0` -g
+#################################################### УДАЛИТЬ ПЕРЕД КОММИТОМ ################################################################################
@for FILE_PO in $(wildcard *.po); do \
LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
@@ -120,12 +127,6 @@ install: check uninstall
@install -dm755 "${DESTDIR}/etc/xdg"
@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
- @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}-windows.glade"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
- @install -dm755 -d "${DESTDIR}${PREFIX}/share/${PKGNAME}/images"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
@if [ -z ${DESTDIR} ]; then \
@@ -134,6 +135,7 @@ install: check uninstall
[ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
fi
@echo "Install: OK"
+ @sed -r "s/^(string version_application=\"*\").*/string version_application;/" -i source/${PKGNAME}.h; \
clean:
@echo "Clean ..."
diff --git a/README.md b/README.md
index ca5f2a3..a9e1fda 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# ubl-settings-repomanager
# Выполнить
# Build
-In order to build ubl-settings-TEMPLATE you will need:
+In order to build ubl-settings-repomanager you will need:
- CMake
- C compiler
diff --git a/gresource.xml b/gresource.xml
new file mode 100644
index 0000000..7b4904a
--- /dev/null
+++ b/gresource.xml
@@ -0,0 +1,13 @@
+
+
+
+ ubl-settings-repomanager.glade
+ ubl-settings-repomanager-windows.glade
+
+
+ ubl-settings-repomanager.css
+
+
+ ubl-settings-repomanager-banner.png
+
+
\ No newline at end of file
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 1e12993..2ef3c2a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -8,6 +8,11 @@ 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)
@@ -21,13 +26,49 @@ 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-repomanager.glade)
+
+set(DEPENDFILES
+ ../ubl-settings-repomanager.glade
+ ../ubl-settings-repomanager-windows.glade
+ ../gresource.xml
+ ../ubl-settings-repomanager-banner.png
+ ../ubl-settings-repomanager.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 -g")
+ -fstack-clash-protection -fcf-protection")
+
set(SOURCE_FILES
ubl-settings-repomanager.c
@@ -35,15 +76,22 @@ set(SOURCE_FILES
ubl-strings.h
ubl-utils.h
ubl-utils.c
- ubl-cmake.h)
+ ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h
+ )
set(LIBRARIES
${GTK_LIBRARIES}
${WEBKIT_LIBRARIES}
+# ${VTE291_LIBRARIES}
pthread)
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+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})
-install(TARGETS ubl-settings-repomanager DESTINATION bin)
\ No newline at end of file
+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)
\ No newline at end of file
diff --git a/source/ubl-settings-repomanager.c b/source/ubl-settings-repomanager.c
index ff794a9..6255b16 100644
--- a/source/ubl-settings-repomanager.c
+++ b/source/ubl-settings-repomanager.c
@@ -30,7 +30,7 @@ void yon_open_browser(GtkWidget *self, char *link){
*/
void on_open_documentation_confirmation(GtkWidget *self, char *link){
if (main_config.always_open_documentation==0){
- GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
+ GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
documentation_confirmation_window *widgets = malloc(sizeof(documentation_confirmation_window));
widgets->Window = yon_gtk_builder_get_widget(builder,"helpConfirmationWindow");
widgets->AcceptButton = yon_gtk_builder_get_widget(builder,"ReadHelpButton");
@@ -84,7 +84,7 @@ void on_link(GtkWidget *self, char* uri, gpointer user_data){
* Присоединять к сигналу "activate" кнопки справки типа MenuItem.
*/
void on_about(){
- GtkBuilder *builder=gtk_builder_new_from_file(glade_path);
+ GtkBuilder *builder=gtk_builder_new_from_resource(glade_path);
GtkWidget *window=yon_gtk_builder_get_widget(builder,"AboutWindow");
GtkWidget *title=yon_gtk_builder_get_widget(builder,"headerAboutTopic");
GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide");
@@ -156,14 +156,30 @@ void on_branch_add(GtkCellRendererText *self, char*path,char *new_text, repo_cre
}
}
+void on_choose_repo_folder(main_window *widgets){
+ GtkWidget *chooser = gtk_file_chooser_dialog_new(ADD_PACKAGE_REPO_LABEL,NULL,GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL);
+ int res = gtk_dialog_run(GTK_DIALOG(chooser));
+ if (res==GTK_RESPONSE_ACCEPT){
+
+ char *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
+ while (1){
+ char *ret = yon_char_divide_search(filename,"/",-1);
+ if (strcmp(ret,filename)==0) break;
+ }
+ yon_repo_append(widgets,filename,YON_REPO_LINE_FILE_TYPE);
+ }
+ on_close_subwindow(chooser);
+}
+
void on_repo_new (GtkWidget *self, main_window *widgets){
- GtkBuilder *builder = gtk_builder_new_from_file(glade_repo_path);
+ GtkBuilder *builder = gtk_builder_new_from_resource(glade_repo_path);
repo_create_window *window = new(repo_create_window);
window->Window=yon_gtk_builder_get_widget(builder,"repoCreateWindow");
window->NameEntry=yon_gtk_builder_get_widget(builder,"repoNameEntry");
window->CancelButton=yon_gtk_builder_get_widget(builder,"repoCancelButton");
window->SaveButton=yon_gtk_builder_get_widget(builder,"repoSaveButton");
window->BranchesTree=yon_gtk_builder_get_widget(builder,"curRepoEditTree");
+ window->repoChooseFolderButton=yon_gtk_builder_get_widget(builder,"repoChooseFolderButton");
window->BranchCell=GTK_CELL_RENDERER(gtk_builder_get_object(builder,"branchTextCell"));
window->BranchesListStore=GTK_LIST_STORE(gtk_builder_get_object(builder,"curRepoEditList"));
gtk_widget_show(window->Window);
@@ -177,6 +193,7 @@ void on_repo_new (GtkWidget *self, main_window *widgets){
g_object_set_property(G_OBJECT(window->BranchCell),"placeholder-text",val);
g_signal_connect(G_OBJECT(window->BranchCell),"edited",G_CALLBACK(on_branch_add),window);
g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_repo_add_new),dict);
+ g_signal_connect(G_OBJECT(window->repoChooseFolderButton),"clicked",G_CALLBACK(on_choose_repo_folder),widgets);
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
}
@@ -196,7 +213,7 @@ void on_repo_configure(GtkWidget *self, main_window *widgets){
GtkTreeModel *model = GTK_TREE_MODEL(main_config.tree_store);
GtkTreeIter iter;
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&iter)){
- GtkBuilder *builder = gtk_builder_new_from_file(glade_repo_path);
+ GtkBuilder *builder = gtk_builder_new_from_resource(glade_repo_path);
repo_create_window *window = new(repo_create_window);
window->Window=yon_gtk_builder_get_widget(builder,"repoEditWindow");
window->NameEntry=yon_gtk_builder_get_widget(builder,"repoEditNameEntry");
@@ -337,7 +354,7 @@ void yon_repo_remove(main_window *widgets){
}
void yon_repo_configure(main_window *widgets){
- GtkBuilder *builder = gtk_builder_new_from_file(glade_repo_path);
+ GtkBuilder *builder = gtk_builder_new_from_resource(glade_repo_path);
GtkTreeIter iter;
GtkTreeModel *model = GTK_TREE_MODEL(main_config.tree_store);
if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->RepoTree)),&model,&iter)){
@@ -391,7 +408,7 @@ void config_init(){
main_window *setup_window(){
/* Widgets getting | Получение виджетов */
main_window *widgets = malloc(sizeof(main_window));
- GtkBuilder *builder = gtk_builder_new_from_file(glade_path);
+ GtkBuilder *builder = gtk_builder_new_from_resource(glade_path);
widgets->Window = yon_gtk_builder_get_widget(builder,"MainWindow");
widgets->HatLabel = yon_gtk_builder_get_widget(builder,"headerTopic");
widgets->PlugBox = yon_gtk_builder_get_widget(builder,"plugBox");
@@ -564,14 +581,14 @@ int main(int argc, char *argv[]){
main_window *widgets = setup_window();
- yon_ubl_header_setup(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
+ yon_ubl_header_setup_resource(widgets->HeadOverlay,widgets->HeadBox,widgets->HeadImage,banner_path);
if (yon_ubl_status_box_setup(widgets->StatusIcon,widgets->StatusBox,widgets->StatusLabel))
yon_ubl_status_box_render(TITLE_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE);
yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,main_config.socket_id,main_config.load_socket_id,main_config.save_socket_id);
GtkCssProvider *css=gtk_css_provider_new();
- gtk_css_provider_load_from_path(css,CssPath,NULL);
+ gtk_css_provider_load_from_resource(css,CssPath);
gtk_style_context_add_provider_for_screen(gdk_screen_get_default(),
GTK_STYLE_PROVIDER(css),
-1);
diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h
index 3e6fa30..51d0176 100644
--- a/source/ubl-settings-repomanager.h
+++ b/source/ubl-settings-repomanager.h
@@ -18,10 +18,10 @@
#define _(String) gettext(String)
-#define glade_path "/usr/share/ubl-settings-repomanager/ui/ubl-settings-repomanager.glade"
-#define glade_repo_path "/usr/share/ubl-settings-repomanager/ui/ubl-settings-repomanager-windows.glade"
-#define banner_path "/usr/share/ubl-settings-repomanager/images/ubl-settings-repomanager-banner.png"
-#define CssPath "/usr/share/ubl-settings-repomanager/css/ubl-settings-repomanager.css"
+#define glade_path "/com/ublinux/ui/ubl-settings-repomanager.glade"
+#define glade_repo_path "/com/ublinux/ui/ubl-settings-repomanager-windows.glade"
+#define banner_path "/com/ublinux/images/ubl-settings-repomanager-banner.png"
+#define CssPath "/com/ublinux/css/ubl-settings-repomanager.css"
#define LocalePath "/usr/share/locale"
#define LocaleName "ubl-settings-repomanager"
@@ -122,6 +122,7 @@ typedef struct {
GtkWidget *CancelButton;
GtkWidget *SaveButton;
GtkCellRenderer *BranchCell;
+ GtkWidget *repoChooseFolderButton;
GtkListStore *BranchesListStore;
} repo_create_window;
diff --git a/source/ubl-utils.c b/source/ubl-utils.c
index ec125cf..7b5724c 100644
--- a/source/ubl-utils.c
+++ b/source/ubl-utils.c
@@ -905,6 +905,12 @@ void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image
gtk_image_set_from_file(GTK_IMAGE(Image), image_path);
}
+void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path)
+{
+ gtk_overlay_add_overlay(GTK_OVERLAY(Overlay), Head);
+ gtk_image_set_from_resource(GTK_IMAGE(Image), image_path);
+}
+
int yon_ubl_status_box_setup(GtkWidget *icon, GtkWidget *box, GtkWidget *label)
{
if(icon&&box&&label){
diff --git a/source/ubl-utils.h b/source/ubl-utils.h
index 5b7eb82..43410b0 100644
--- a/source/ubl-utils.h
+++ b/source/ubl-utils.h
@@ -290,10 +290,13 @@ void yon_ubl_status_box_render(char *text, BACKGROUND_IMAGE_TYPE type);
* [imag_path] - путь до картинки, загружаемой в [image]
*/
#define yon_ubl_header_setup(overlay, head, image, imag_path) _yon_ubl_header_setup(GTK_WIDGET(overlay), GTK_WIDGET(head), GTK_WIDGET(image), (char *)imag_path)
+#define yon_ubl_header_setup_resource(overlay, head, image, imag_path) _yon_ubl_header_setup_resource(GTK_WIDGET(overlay), GTK_WIDGET(head), GTK_WIDGET(image), (char *)imag_path)
#endif
void _yon_ubl_header_setup(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path);
+void _yon_ubl_header_setup_resource(GtkWidget *Overlay, GtkWidget *Head, GtkWidget *Image, char *image_path);
+
void yon_ubl_setup_sockets(GtkWidget *main_window, GtkWidget *left_window, GtkWidget *right_window, int socket_main_id, int socket_left_id, int socket_right_id);
#ifdef WEBKIT_FOUND
diff --git a/ubl-settings-repomanager b/ubl-settings-repomanager
index 94d87e0..5e0244f 100755
Binary files a/ubl-settings-repomanager and b/ubl-settings-repomanager differ
diff --git a/ubl-settings-repomanager-windows.glade b/ubl-settings-repomanager-windows.glade
index b94c777..4c03776 100644
--- a/ubl-settings-repomanager-windows.glade
+++ b/ubl-settings-repomanager-windows.glade
@@ -87,6 +87,30 @@
0
+
+
+
+ False
+ True
+ 1
+
+
@@ -154,7 +178,6 @@
@@ -384,7 +407,9 @@
0
False
-
+
-
-
-
-
-
-
-
-
- False
- True
- 6
-
-
-
-
-
- False
- True
- 7
-
-
-
-
-
- False
- True
- 8
-
-
-
-
-
- False
- True
- 9
-
-
-
-
-
- False
- True
- 10
-
-
-
-
-
- True
- True
- 1
-
-
True
@@ -1685,28 +1087,4 @@ local package sources
-
-
-