[gnome-builder] libide-gui: remove unused sources for GTK 4 port
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] libide-gui: remove unused sources for GTK 4 port
- Date: Tue, 12 Jul 2022 06:39:12 +0000 (UTC)
commit db9c8263b84bc2ac90e339e1c100433b35b88fd4
Author: Christian Hergert <chergert redhat com>
Date: Mon Jul 11 21:35:41 2022 -0700
libide-gui: remove unused sources for GTK 4 port
src/libide/gui/ide-application-shortcuts.c | 79 --
src/libide/gui/ide-frame-actions.c | 429 -------
src/libide/gui/ide-frame-empty-state.c | 46 -
src/libide/gui/ide-frame-empty-state.h | 37 -
src/libide/gui/ide-frame-empty-state.ui | 106 --
src/libide/gui/ide-frame-header.c | 827 -------------
src/libide/gui/ide-frame-header.h | 44 -
src/libide/gui/ide-frame-header.ui | 112 --
src/libide/gui/ide-frame-shortcuts.c | 113 --
src/libide/gui/ide-frame-wrapper.c | 132 ---
src/libide/gui/ide-frame-wrapper.h | 31 -
src/libide/gui/ide-grid-column-actions.c | 81 --
src/libide/gui/ide-grid-column.c | 406 -------
src/libide/gui/ide-grid-column.h | 47 -
src/libide/gui/ide-gui-private.h | 113 --
src/libide/gui/ide-header-bar-shortcuts.c | 68 --
src/libide/gui/ide-keybindings.c | 366 ------
src/libide/gui/ide-keybindings.h | 36 -
.../gui/ide-notifications-button-popover-private.h | 31 -
src/libide/gui/ide-notifications-button-popover.c | 51 -
src/libide/gui/ide-panel.c | 85 --
src/libide/gui/ide-panel.h | 48 -
src/libide/gui/ide-panel.ui | 13 -
.../gui/ide-preferences-language-row-private.h | 31 -
src/libide/gui/ide-preferences-language-row.c | 171 ---
src/libide/gui/ide-preferences-language-row.ui | 26 -
src/libide/gui/ide-preferences-surface.c | 136 ---
src/libide/gui/ide-preferences-surface.h | 36 -
src/libide/gui/ide-search-button.c | 290 -----
src/libide/gui/ide-search-button.h | 40 -
src/libide/gui/ide-shortcut-label-private.h | 45 -
src/libide/gui/ide-shortcut-label.c | 271 -----
src/libide/gui/ide-shortcuts-window-private.h | 31 -
src/libide/gui/ide-shortcuts-window.c | 48 -
src/libide/gui/ide-shortcuts-window.ui | 687 -----------
src/libide/gui/ide-surface.c | 259 ----
src/libide/gui/ide-surface.h | 67 --
src/libide/gui/ide-surfaces-button.c | 107 --
src/libide/gui/ide-surfaces-button.h | 37 -
src/libide/gui/ide-tagged-entry.c | 1240 --------------------
src/libide/gui/ide-tagged-entry.h | 123 --
src/libide/gui/ide-transfer-button.c | 247 ----
src/libide/gui/ide-transfer-button.h | 48 -
src/libide/gui/ide-transient-sidebar.c | 355 ------
src/libide/gui/ide-transient-sidebar.h | 58 -
src/libide/gui/ide-window-settings-private.h | 29 -
src/libide/gui/ide-window-settings.c | 165 ---
src/libide/gui/ide-worker-manager.c | 348 ------
src/libide/gui/ide-worker-manager.h | 42 -
src/libide/gui/ide-worker-process.c | 475 --------
src/libide/gui/ide-worker-process.h | 50 -
src/libide/gui/ide-worker.c | 68 --
src/libide/gui/ide-worker.h | 51 -
src/libide/gui/ide-workspace-actions.c | 64 +-
src/libide/gui/ide-workspace-addin.h | 7 -
src/libide/gui/ide-workspace.ui | 33 -
src/libide/gui/libide-gui.gresource.xml | 6 -
src/libide/gui/libide-gui.h | 70 +-
src/libide/gui/meson.build | 53 +-
59 files changed, 33 insertions(+), 9082 deletions(-)
---
diff --git a/src/libide/gui/ide-workspace-actions.c b/src/libide/gui/ide-workspace-actions.c
index daef11ed8..106e39a36 100644
--- a/src/libide/gui/ide-workspace-actions.c
+++ b/src/libide/gui/ide-workspace-actions.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "ide-gui-global.h"
-#include "ide-gui-private.h"
+#include "ide-workspace-private.h"
static void
ide_workspace_actions_close (GSimpleAction *action,
@@ -38,70 +38,8 @@ ide_workspace_actions_close (GSimpleAction *action,
gtk_window_close (GTK_WINDOW (self));
}
-static void
-ide_workspace_actions_show_menu (GSimpleAction *action,
- GVariant *param,
- gpointer user_data)
-{
- IdeWorkspace *self = user_data;
- GtkWidget *titlebar;
-
- g_assert (G_IS_SIMPLE_ACTION (action));
- g_assert (IDE_IS_WORKSPACE (self));
-
- titlebar = gtk_window_get_titlebar (GTK_WINDOW (self));
- if (GTK_IS_STACK (titlebar))
- titlebar = gtk_stack_get_visible_child (GTK_STACK (titlebar));
-
- if (IDE_IS_HEADER_BAR (titlebar))
- _ide_header_bar_show_menu (IDE_HEADER_BAR (titlebar));
-}
-
-static void
-ide_workspace_actions_surface (GSimpleAction *action,
- GVariant *param,
- gpointer user_data)
-{
- IdeWorkspace *self = user_data;
- const gchar *surface;
-
- g_assert (G_IS_SIMPLE_ACTION (action));
- g_assert (param != NULL);
- g_assert (g_variant_is_of_type (param, G_VARIANT_TYPE_STRING));
- g_assert (IDE_IS_WORKSPACE (self));
-
- surface = g_variant_get_string (param, NULL);
-
- ide_workspace_set_visible_surface_name (self, surface);
-}
-
-static void
-ide_workspace_actions_command (GSimpleAction *action,
- GVariant *param,
- gpointer user_data)
-{
- IdeCommandManager *command_manager;
- IdeWorkspace *self = user_data;
- const gchar *command;
- IdeContext *context;
-
- g_assert (G_IS_SIMPLE_ACTION (action));
- g_assert (param != NULL);
- g_assert (g_variant_is_of_type (param, G_VARIANT_TYPE_STRING));
- g_assert (IDE_IS_WORKSPACE (self));
-
- command = g_variant_get_string (param, NULL);
- context = ide_widget_get_context (GTK_WIDGET (self));
- command_manager = ide_command_manager_from_context (context);
-
- _ide_command_manager_execute (command_manager, self, command);
-}
-
static const GActionEntry actions[] = {
- { "show-menu", ide_workspace_actions_show_menu },
- { "surface", ide_workspace_actions_surface, "s" },
{ "close", ide_workspace_actions_close },
- { "command", ide_workspace_actions_command, "s" },
};
void
diff --git a/src/libide/gui/ide-workspace-addin.h b/src/libide/gui/ide-workspace-addin.h
index 1bf8599bc..49e0d70a3 100644
--- a/src/libide/gui/ide-workspace-addin.h
+++ b/src/libide/gui/ide-workspace-addin.h
@@ -37,9 +37,6 @@ struct _IdeWorkspaceAddinInterface
IdeWorkspace *workspace);
void (*unload) (IdeWorkspaceAddin *self,
IdeWorkspace *workspace);
- void (*surface_set) (IdeWorkspaceAddin *self,
- IdeSurface *surface);
- gboolean (*can_close) (IdeWorkspaceAddin *self);
};
IDE_AVAILABLE_IN_3_32
@@ -48,11 +45,7 @@ void ide_workspace_addin_load (IdeWorkspaceAddin *s
IDE_AVAILABLE_IN_3_32
void ide_workspace_addin_unload (IdeWorkspaceAddin *self,
IdeWorkspace *workspace);
-IDE_AVAILABLE_IN_3_32
-void ide_workspace_addin_surface_set (IdeWorkspaceAddin *self,
IdeSurface *surface);
-IDE_AVAILABLE_IN_3_34
-gboolean ide_workspace_addin_can_close (IdeWorkspaceAddin *self);
IDE_AVAILABLE_IN_3_40
IdeWorkspaceAddin *ide_workspace_addin_find_by_module_name (IdeWorkspace *workspace,
const gchar *module_name);
diff --git a/src/libide/gui/libide-gui.gresource.xml b/src/libide/gui/libide-gui.gresource.xml
index 78a1f0a38..acf0f00a7 100644
--- a/src/libide/gui/libide-gui.gresource.xml
+++ b/src/libide/gui/libide-gui.gresource.xml
@@ -8,20 +8,14 @@
</gresource>
<gresource prefix="/org/gnome/libide-gui/ui">
<file preprocess="xml-stripblanks">ide-environment-editor-row.ui</file>
- <file preprocess="xml-stripblanks">ide-frame-header.ui</file>
<file preprocess="xml-stripblanks">ide-frame.ui</file>
- <file preprocess="xml-stripblanks">ide-frame-empty-state.ui</file>
<file preprocess="xml-stripblanks">ide-header-bar.ui</file>
<file preprocess="xml-stripblanks">ide-notification-list-box-row.ui</file>
<file preprocess="xml-stripblanks">ide-notification-view.ui</file>
<file preprocess="xml-stripblanks">ide-notifications-button.ui</file>
<file preprocess="xml-stripblanks">ide-omni-bar.ui</file>
- <file preprocess="xml-stripblanks">ide-panel.ui</file>
- <file preprocess="xml-stripblanks">ide-preferences-language-row.ui</file>
<file preprocess="xml-stripblanks">ide-preferences-window.ui</file>
<file preprocess="xml-stripblanks">ide-primary-workspace.ui</file>
<file preprocess="xml-stripblanks">ide-run-button.ui</file>
- <file preprocess="xml-stripblanks">ide-shortcuts-window.ui</file>
- <file preprocess="xml-stripblanks">ide-workspace.ui</file>
</gresource>
</gresources>
diff --git a/src/libide/gui/libide-gui.h b/src/libide/gui/libide-gui.h
index 81d3748fa..f29858dcd 100644
--- a/src/libide/gui/libide-gui.h
+++ b/src/libide/gui/libide-gui.h
@@ -20,49 +20,41 @@
#pragma once
-#include <gtk/gtk.h>
+#include <adwaita.h>
+
#include <libide-core.h>
+#include <libide-gtk.h>
#include <libide-io.h>
#include <libide-projects.h>
#include <libide-threading.h>
#define IDE_GUI_INSIDE
-
-#include "ide-application.h"
-#include "ide-application-addin.h"
-#include "ide-cell-renderer-fancy.h"
-#include "ide-config-view-addin.h"
-#include "ide-environment-editor.h"
-#include "ide-frame.h"
-#include "ide-frame-addin.h"
-#include "ide-frame-empty-state.h"
-#include "ide-frame-header.h"
-#include "ide-header-bar.h"
-#include "ide-grid.h"
-#include "ide-grid-column.h"
-#include "ide-gui-global.h"
-#include "ide-header-bar.h"
-#include "ide-marked-view.h"
-#include "ide-notifications-button.h"
-#include "ide-omni-bar-addin.h"
-#include "ide-omni-bar.h"
-#include "ide-page.h"
-#include "ide-pane.h"
-#include "ide-panel.h"
-#include "ide-preferences-addin.h"
-#include "ide-preferences-surface.h"
-#include "ide-preferences-window.h"
-#include "ide-primary-workspace.h"
-#include "ide-search-button.h"
-#include "ide-session-addin.h"
-#include "ide-surface.h"
-#include "ide-surfaces-button.h"
-#include "ide-tagged-entry.h"
-#include "ide-transfer-button.h"
-#include "ide-transient-sidebar.h"
-#include "ide-workbench.h"
-#include "ide-workbench-addin.h"
-#include "ide-workspace.h"
-#include "ide-workspace-addin.h"
-
+# include "ide-application.h"
+# include "ide-application-addin.h"
+# include "ide-config-view-addin.h"
+# include "ide-environment-editor.h"
+# include "ide-frame.h"
+# include "ide-frame-addin.h"
+# include "ide-header-bar.h"
+# include "ide-grid.h"
+# include "ide-gui-enums.h"
+# include "ide-gui-global.h"
+# include "ide-header-bar.h"
+# include "ide-marked-view.h"
+# include "ide-notifications-button.h"
+# include "ide-omni-bar-addin.h"
+# include "ide-omni-bar.h"
+# include "ide-page.h"
+# include "ide-pane.h"
+# include "ide-panel-position.h"
+# include "ide-preferences-addin.h"
+# include "ide-primary-workspace.h"
+# include "ide-run-button.h"
+# include "ide-search-popover.h"
+# include "ide-session-addin.h"
+# include "ide-shortcut-provider.h"
+# include "ide-workbench.h"
+# include "ide-workbench-addin.h"
+# include "ide-workspace.h"
+# include "ide-workspace-addin.h"
#undef IDE_GUI_INSIDE
diff --git a/src/libide/gui/meson.build b/src/libide/gui/meson.build
index e55c08a2b..77f16c7a1 100644
--- a/src/libide/gui/meson.build
+++ b/src/libide/gui/meson.build
@@ -12,11 +12,8 @@ libide_gui_public_headers = [
'ide-application-addin.h',
'ide-config-view-addin.h',
'ide-environment-editor.h',
- 'ide-frame-addin.h',
- 'ide-frame-empty-state.h',
- 'ide-frame-header.h',
'ide-frame.h',
- 'ide-grid-column.h',
+ 'ide-frame-addin.h',
'ide-grid.h',
'ide-gui-global.h',
'ide-header-bar.h',
@@ -26,19 +23,10 @@ libide_gui_public_headers = [
'ide-omni-bar.h',
'ide-page.h',
'ide-pane.h',
- 'ide-panel.h',
'ide-preferences-addin.h',
- 'ide-preferences-surface.h',
'ide-preferences-window.h',
'ide-primary-workspace.h',
- 'ide-search-button.h',
'ide-session-addin.h',
- 'ide-surface.h',
- 'ide-surfaces-button.h',
- 'ide-tagged-entry.h',
- 'ide-transfer-button.h',
- 'ide-transient-sidebar.h',
- 'ide-worker.h',
'ide-workbench.h',
'ide-workbench-addin.h',
'ide-workspace.h',
@@ -55,50 +43,24 @@ install_headers(libide_gui_public_headers, subdir: libide_gui_header_subdir)
libide_gui_private_headers = [
'ide-application-private.h',
'ide-environment-editor-row.h',
- 'ide-frame-wrapper.h',
- 'ide-gui-private.h',
- 'ide-keybindings.h',
'ide-notification-list-box-row-private.h',
- 'ide-notifications-button-popover-private.h',
'ide-notification-stack-private.h',
'ide-notification-view-private.h',
'ide-preferences-builtin-private.h',
- 'ide-preferences-language-row-private.h',
- 'ide-run-button.h',
'ide-session-private.h',
- 'ide-window-settings-private.h',
- 'ide-shortcut-label-private.h',
- 'ide-shortcuts-window-private.h',
- 'ide-worker-manager.h',
- 'ide-worker-process.h',
]
libide_gui_private_sources = [
'ide-application-actions.c',
'ide-application-color.c',
- 'ide-application-shortcuts.c',
'ide-application-plugins.c',
'ide-environment-editor-row.c',
- 'ide-frame-actions.c',
- 'ide-frame-shortcuts.c',
- 'ide-frame-wrapper.c',
- 'ide-grid-actions.c',
- 'ide-grid-column-actions.c',
- 'ide-header-bar-shortcuts.c',
- 'ide-keybindings.c',
'ide-notification-list-box-row.c',
'ide-notification-stack.c',
'ide-notification-view.c',
- 'ide-notifications-button-popover.c',
'ide-preferences-builtin.c',
- 'ide-preferences-language-row.c',
'ide-primary-workspace-actions.c',
- 'ide-run-button.c',
'ide-session.c',
- 'ide-shortcuts-window.c',
- 'ide-window-settings.c',
- 'ide-worker-manager.c',
- 'ide-worker-process.c',
'ide-workspace-actions.c',
]
@@ -110,10 +72,7 @@ libide_gui_public_sources = [
'ide-config-view-addin.c',
'ide-environment-editor.c',
'ide-frame-addin.c',
- 'ide-frame-empty-state.c',
- 'ide-frame-header.c',
'ide-frame.c',
- 'ide-grid-column.c',
'ide-grid.c',
'ide-gui-global.c',
'ide-header-bar.c',
@@ -123,24 +82,14 @@ libide_gui_public_sources = [
'ide-omni-bar.c',
'ide-page.c',
'ide-pane.c',
- 'ide-panel.c',
'ide-primary-workspace.c',
'ide-preferences-addin.c',
- 'ide-preferences-surface.c',
'ide-preferences-window.c',
- 'ide-search-button.c',
'ide-session-addin.c',
- 'ide-shortcut-label.c',
- 'ide-surface.c',
- 'ide-surfaces-button.c',
- 'ide-tagged-entry.c',
- 'ide-transient-sidebar.c',
- 'ide-transfer-button.c',
'ide-workbench.c',
'ide-workbench-addin.c',
'ide-workspace.c',
'ide-workspace-addin.c',
- 'ide-worker.c',
]
libide_gui_sources = libide_gui_public_sources + libide_gui_private_sources
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
