From e76866030df98976d341cb03a566a1c72db11e28 Mon Sep 17 00:00:00 2001 From: daleclack Date: Wed, 31 Jan 2024 15:43:14 +0800 Subject: [PATCH] Add space for the addon apps --- Gtk4_Reset/res/mydock.ui | 1087 +++++++++++++++++----------------- Gtk4_Reset/src/ui/MyDock.cpp | 11 +- 2 files changed, 563 insertions(+), 535 deletions(-) diff --git a/Gtk4_Reset/res/mydock.ui b/Gtk4_Reset/res/mydock.ui index e6bb249..698221f 100644 --- a/Gtk4_Reset/res/mydock.ui +++ b/Gtk4_Reset/res/mydock.ui @@ -213,6 +213,550 @@ + + 0 + 0 + center + start + 1 + 1 + + + 64 + 64 + 1 + 1 + win.about + + + vertical + + + 0 + 0 + 48 + btnabout + + + + + 74 + about + + + + + 0 + + 1 + 0 + + + + + + 64 + 64 + 1 + 1 + + + vertical + + + 48 + audacious_whitesur + + + + + audacious + + + + + 0 + + 2 + 0 + + + + + + 1 + 1 + + + vertical + + + 48 + drawing_app + + + + + Drawing + + + + + 0 + + 4 + 0 + + + + + + 1 + 1 + + + vertical + + + 48 + file-app + + + + + MyFinder + + + + + 0 + + 5 + 0 + + + + + + 1 + 1 + + + vertical + + + 48 + my_textedit + + + + + Gedit + + + + + 0 + + 6 + 0 + + + + + + 1 + 1 + + + vertical + + + 48 + game + + + + + Guess game + + + + + 0 + + 0 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + image_app + + + + + Image Viewer + + + + + 0 + + 1 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + my_textedit + + + + + Notepad(win) + + + + + 0 + + 4 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + my_textedit + + + + + TextEditor + + + + + 0 + + 5 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + vlc_whitesur + + + + + VLC(linux) + + + + + 0 + + 6 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + vlc_whitesur + + + + + VLC(win32) + + + + + 0 + + 0 + 2 + + + + + + 1 + 1 + + + vertical + + + 48 + myrunner + + + + + Run App + + + + + 0 + + 3 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + my_prefs + + + + + Preferences + + + + + 0 + + 2 + 1 + + + + + + 1 + 1 + + + vertical + + + 48 + 24game + + + + + 24Game + + + + + 0 + + 0 + 0 + + + + + + 1 + 1 + + + vertical + + + 48 + calcapp + + + + + Calculator + + + + + 0 + + 3 + 0 + + + + + + 1 + 1 + + + vertical + + + mines_app + 48 + + + + + MineSweeper + + + + + 0 + + 1 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical @@ -290,549 +834,26 @@ - - 0 - 0 - center - start - 1 - 1 + + 1 + 1 + crossfade - - 64 - 64 - 1 - 1 - win.about + + Integrated - - vertical - - - 0 - 0 - 48 - btnabout - - - - - 74 - about - - - + - 0 - - 1 - 0 - - - 64 - 64 - 1 - 1 + + Addons - - vertical - - - 48 - audacious_whitesur - - - - - audacious - - - + - 0 - - 2 - 0 - - - - 1 - 1 - - - vertical - - - 48 - drawing_app - - - - - Drawing - - - - - 0 - - 4 - 0 - - - - - - 1 - 1 - - - vertical - - - 48 - file-app - - - - - MyFinder - - - - - 0 - - 5 - 0 - - - - - - 1 - 1 - - - vertical - - - 48 - my_textedit - - - - - Gedit - - - - - 0 - - 6 - 0 - - - - - - 1 - 1 - - - vertical - - - 48 - game - - - - - Guess game - - - - - 0 - - 0 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - image_app - - - - - Image Viewer - - - - - 0 - - 1 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - my_textedit - - - - - Notepad(win) - - - - - 0 - - 4 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - my_textedit - - - - - TextEditor - - - - - 0 - - 5 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - vlc_whitesur - - - - - VLC(linux) - - - - - 0 - - 6 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - vlc_whitesur - - - - - VLC(win32) - - - - - 0 - - 0 - 2 - - - - - - 1 - 1 - - - vertical - - - 48 - myrunner - - - - - Run App - - - - - 0 - - 3 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - my_prefs - - - - - Preferences - - - - - 0 - - 2 - 1 - - - - - - 1 - 1 - - - vertical - - - 48 - 24game - - - - - 24Game - - - - - 0 - - 0 - 0 - - - - - - 1 - 1 - - - vertical - - - 48 - calcapp - - - - - Calculator - - - - - 0 - - 3 - 0 - - - - - - 1 - 1 - - - vertical - - - mines_app - 48 - - - - - MineSweeper - - - - - 0 - - 1 - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1 1 diff --git a/Gtk4_Reset/src/ui/MyDock.cpp b/Gtk4_Reset/src/ui/MyDock.cpp index ac680b0..64d3771 100644 --- a/Gtk4_Reset/src/ui/MyDock.cpp +++ b/Gtk4_Reset/src/ui/MyDock.cpp @@ -15,8 +15,8 @@ struct _MyDock GtkWidget *dock_box, *main_box, *finder_box, *dock_left, *icons_sw, *main_overlay; // Dock, finder GtkWidget *main_pic, *finder; - GtkWidget *btnlaunch, *launchpad_stack, // launchpad - *default_page, *launchpad_page; + GtkWidget *btnlaunch, *launchpad_stack, *default_page, // launchpad + *launchpad_page, *apps_grid, *apps_stack, *default_box, *addon_box; GtkWidget *btnfiles, *btndraw, *btncalc, *btnedit, *btnimage, // Dock buttons *btnset, *btngame, *btngame24, *btnmine; GtkWidget *image_file, *image_draw, *image_calc, *image_game, // Image widget for dock buttons @@ -175,6 +175,10 @@ static void my_dock_init(MyDock *self) self->launchpad_stack = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "launchpad_stack")); self->default_page = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "default_page")); self->launchpad_page = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "launchpad_page")); + self->apps_grid = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "apps_grid")); + self->apps_stack = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "apps_stack")); + self->default_box = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "default_box")); + self->addon_box = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "addon_box")); self->padaud = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padaud")); self->padabout = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padabout")); self->padcalc = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "padcalc")); @@ -251,6 +255,9 @@ static void my_dock_init(MyDock *self) // Add Style for finder my_finder_add_style(MY_FINDER(self->finder), provider); + // Add Apps grid + gtk_box_append(GTK_BOX(self->default_box), self->apps_grid); + // Add Style to launchpad page gtk_widget_add_css_class(self->launchpad_page, "dock_style"); gtk_style_context_add_provider_for_display(gtk_widget_get_display(self->launchpad_page),