daleclack
/
My_GtkUi
mirror of https://github.com/daleclack/My_GtkUi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for dock position config

This commit is contained in:
daleclack 2024-02-05 21:24:11 +08:00
parent 144bf75379
commit eb31743007
3 changed files with 64 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Gtk4_Reset/src/ui/MyDock.cpp
View File

@ -13,8 +13,8 @@ struct _MyDock
GtkBox parent_instance;
GtkWindow *parent_win;
GtkBuilder *dock_builder; // Main builder
GtkWidget *dock_box, *main_box, *finder_box,
*dock_left, *icons_sw, *main_overlay; // Dock, finder
GtkWidget *dock_box, *main_box, *finder_box, *icons_box,
*dock_left, *dock_right, *dock_bottom, *icons_sw, *main_overlay; // Dock, finder
GtkWidget *main_pic, *finder;
GtkWidget *btnlaunch, *launchpad_stack, *default_page, *apps_grid, // launchpad
*launchpad_page, *apps_stack, *default_box, *addon_box,
@ -154,7 +154,10 @@ static void my_dock_init(MyDock *self)
self->main_box = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "main_box"));
self->finder_box = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "finder_box"));
self->dock_left = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "dock_left"));
self->dock_right = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "dock_right"));
self->dock_bottom = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "dock_bottom"));
self->icons_sw = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "icons_sw"));
self->icons_box = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "icons_box"));
self->btnlaunch = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "btnlaunch"));
self->btnfiles = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "btnfiles"));
self->image_file = GTK_WIDGET(gtk_builder_get_object(self->dock_builder, "image_file"));
@ -227,25 +230,50 @@ static void my_dock_init(MyDock *self)
// g_object_unref(pixbuf);
// g_object_unref(sized);
// Create prefs window
self->prefs_win = my_prefs_new(self->main_pic);
// Add finder
self->finder = my_finder_new(GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_append(GTK_BOX(self->finder_box), self->finder);
// Pack widgets
// Dock position and mode, will be changable soon
gtk_widget_set_vexpand(self->icons_sw, TRUE);
gtk_widget_set_valign(self->icons_sw, GTK_ALIGN_FILL);
gtk_widget_set_valign(self->dock_box, GTK_ALIGN_FILL);
gtk_box_append(GTK_BOX(self->dock_left), self->dock_box);
// Pack widgets for dock
// Dock position and mode
DockPos dock_pos = my_prefs_get_dock_pos(self->prefs_win);
switch (dock_pos)
{
case DockPos::Pos_Left:
gtk_widget_set_vexpand(self->icons_sw, TRUE);
gtk_widget_set_valign(self->icons_sw, GTK_ALIGN_FILL);
gtk_widget_set_valign(self->dock_box, GTK_ALIGN_FILL);
gtk_box_append(GTK_BOX(self->dock_left), self->dock_box);
break;
case DockPos::Pos_Right:
gtk_widget_set_vexpand(self->icons_sw, TRUE);
gtk_widget_set_valign(self->icons_sw, GTK_ALIGN_FILL);
gtk_widget_set_valign(self->dock_box, GTK_ALIGN_FILL);
gtk_box_append(GTK_BOX(self->dock_right), self->dock_box);
break;
case DockPos::Pos_Bottom:
gtk_orientable_set_orientation(GTK_ORIENTABLE(self->dock_box),
GTK_ORIENTATION_HORIZONTAL);
gtk_orientable_set_orientation(GTK_ORIENTABLE(self->icons_box),
GTK_ORIENTATION_HORIZONTAL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(self->icons_sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
gtk_widget_set_hexpand(self->icons_sw, TRUE);
gtk_widget_set_halign(self->icons_sw, GTK_ALIGN_FILL);
gtk_widget_set_halign(self->dock_box, GTK_ALIGN_FILL);
gtk_box_append(GTK_BOX(self->dock_bottom), self->dock_box);
break;
}
// The Main widget, for background
gtk_overlay_set_child(GTK_OVERLAY(self->main_overlay), self->main_pic);
gtk_overlay_add_overlay(GTK_OVERLAY(self->main_overlay), self->main_box);
gtk_box_append(GTK_BOX(self), self->main_overlay);
// Create prefs window
self->prefs_win = my_prefs_new(self->main_pic);
// Link Signals
g_signal_connect(self->btnlaunch, "clicked", G_CALLBACK(btnlaunch_clicked), self);
g_signal_connect(self->btnset, "clicked", G_CALLBACK(btnset_clicked), self);

23
Gtk4_Reset/src/ui/MyPrefs.cpp
View File

@ -58,6 +58,7 @@ struct _MyPrefs
int current_folder_index, current_image_index; // Index of images
DockPos curr_dock_pos; // Dock Position
gboolean panel_mode; // Whether panel mode is activated
DockPos dock_pos; // Dock Position
};
G_DEFINE_TYPE(MyPrefs, my_prefs, GTK_TYPE_WINDOW)
@ -401,6 +402,7 @@ static void my_prefs_load_config(MyPrefs *self)
self->height = data["height"];
self->current_folder_index = data["folder_index"];
self->current_image_index = data["image_index"];
self->dock_pos = data["position"];
}
else
{
@ -409,6 +411,7 @@ static void my_prefs_load_config(MyPrefs *self)
self->height = 576;
self->current_folder_index = 0;
self->current_image_index = 0;
self->dock_pos = DockPos::Pos_Left;
}
json_file.close();
}
@ -759,6 +762,20 @@ static void my_prefs_init(MyPrefs *self)
// Set default mode for check button
gtk_check_button_set_active(GTK_CHECK_BUTTON(self->mode_check), TRUE);
// Default value for dock position
switch (self->dock_pos)
{
case DockPos::Pos_Bottom:
gtk_check_button_set_active(GTK_CHECK_BUTTON(self->radio_bottom), TRUE);
break;
case DockPos::Pos_Left:
gtk_check_button_set_active(GTK_CHECK_BUTTON(self->radio_left), TRUE);
break;
case DockPos::Pos_Right:
gtk_check_button_set_active(GTK_CHECK_BUTTON(self->radio_right), TRUE);
break;
}
// Set Child
gtk_window_set_child(GTK_WINDOW(self), self->stack_box);
@ -794,6 +811,12 @@ void my_prefs_start_scan(MyPrefs *self)
g_timeout_add(1, scan_func, self);
}
// Get Dock position
DockPos my_prefs_get_dock_pos(MyPrefs *self)
{
return self->dock_pos;
}
MyPrefs *my_prefs_new(GtkWidget *back)
{
// Create Prefs widget

2
Gtk4_Reset/src/ui/MyPrefs.h
View File

@ -15,4 +15,6 @@ void my_prefs_start_scan(MyPrefs *self);
void my_prefs_first_load(MyPrefs *self);
DockPos my_prefs_get_dock_pos(MyPrefs *self);
MyPrefs *my_prefs_new(GtkWidget *back);