[ghex/gtk4-port: 40/91] Add label as feedback for when no doc loaded.
- From: Logan Rathbone <larathbone src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ghex/gtk4-port: 40/91] Add label as feedback for when no doc loaded.
- Date: Thu, 12 Aug 2021 23:35:10 +0000 (UTC)
commit d038990c652ec38d78b1a71a8e8f87ac54795f1e
Author: Logan Rathbone <poprocks gmail com>
Date: Mon Jan 18 11:02:16 2021 -0500
Add label as feedback for when no doc loaded.
src/ghex-application-window.c | 55 ++++++++++++++++++++++++++++++++++--------
src/ghex-application-window.ui | 21 ++++++++++++++--
2 files changed, 64 insertions(+), 12 deletions(-)
---
diff --git a/src/ghex-application-window.c b/src/ghex-application-window.c
index 9ecfbcea..a46c140d 100644
--- a/src/ghex-application-window.c
+++ b/src/ghex-application-window.c
@@ -82,6 +82,7 @@ struct _GHexApplicationWindow
/* for i in `cat tmp.txt`; do echo GtkWidget *${i}; done
*/
+ GtkWidget *no_doc_label;
GtkWidget *hex_notebook;
GtkWidget *conversions_box;
GtkWidget *findreplace_box;
@@ -129,7 +130,7 @@ G_DEFINE_TYPE (GHexApplicationWindow, ghex_application_window,
/* ---- */
-/* FUNCTION DECLARATIONS */
+/* PRIVATE FORWARD DECLARATIONS */
/* NOTE: see also *SET_SHOW_TEMPLATE macros defined below. */
static void ghex_application_window_set_show_chartable (GHexApplicationWindow *self,
@@ -150,6 +151,7 @@ GHexNotebookTab * ghex_application_window_get_current_tab (GHexApplicationWindow
static void set_statusbar(GHexApplicationWindow *self, const char *str);
static void update_status_message (GHexApplicationWindow *self);
+static void update_gui_data (GHexApplicationWindow *self);
/* GHexApplicationWindow -- PRIVATE FUNCTIONS */
@@ -346,11 +348,9 @@ tab_close_cb (GHexNotebookTab *tab,
doc = gtk_hex_get_document (self->gh);
g_return_if_fail (HEX_IS_DOCUMENT (doc));
- if (hex_document_has_changed (doc))
- {
+ if (hex_document_has_changed (doc)) {
close_doc_confirmation_dialog (self);
- }
- else {
+ } else {
ghex_application_window_remove_tab (self, tab);
}
}
@@ -381,6 +381,9 @@ notebook_switch_page_cb (GtkNotebook *notebook,
doc = gtk_hex_get_document (self->gh);
ghex_application_window_set_can_save (self,
hex_document_has_changed (doc));
+
+ /* Update dialogs, offset status bar, etc. */
+ update_gui_data (self);
}
static void
@@ -391,9 +394,13 @@ notebook_page_added_cb (GtkNotebook *notebook,
{
GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(user_data);
+ g_assert (GTK_WIDGET(notebook) == self->hex_notebook);
+
/* Let's play this super dumb. If a page is added, that will generally
- * mind the Find button should be activated. Change if necessary.
+ * mean we don't have to count the pages to see if we have > 0.
*/
+ gtk_widget_show (self->hex_notebook);
+ gtk_widget_hide (self->no_doc_label);
enable_main_actions (self, TRUE);
}
@@ -405,11 +412,15 @@ notebook_page_removed_cb (GtkNotebook *notebook,
{
GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(user_data);
+ g_assert (GTK_WIDGET(notebook) == self->hex_notebook);
+
g_debug("%s: n_pages: %d",
__func__, gtk_notebook_get_n_pages(notebook));
if (gtk_notebook_get_n_pages (notebook) == 0) {
enable_main_actions (self, FALSE);
+ gtk_widget_hide (self->hex_notebook);
+ gtk_widget_show (self->no_doc_label);
}
}
@@ -490,23 +501,45 @@ setup_converter (GHexApplicationWindow *self)
}
static void
-cursor_moved_cb (GtkHex *gh, gpointer user_data)
+update_gui_data (GHexApplicationWindow *self)
{
- GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(user_data);
int current_pos;
HexDialogVal64 val;
- current_pos = gtk_hex_get_cursor (gh);
+ g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
+ g_return_if_fail (GTK_IS_HEX (self->gh));
+
+ current_pos = gtk_hex_get_cursor (self->gh);
update_status_message (self);
for (int i = 0; i < 8; i++)
{
/* returns 0 on buffer overflow, which is what we want */
- val.v[i] = gtk_hex_get_byte (gh, current_pos+i);
+ val.v[i] = gtk_hex_get_byte (self->gh, current_pos+i);
}
hex_dialog_updateview (self->dialog, &val);
}
+static void
+cursor_moved_cb (GtkHex *gh, gpointer user_data)
+{
+ GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(user_data);
+ int current_pos;
+ HexDialogVal64 val;
+
+ /* If the cursor has been moved by a function call for a GtkHex that is
+ * *not* in view, we're not interested. */
+ if (self->gh != gh) {
+ g_debug("%s: Cursor has been moved for a GtkHex widget not in view: "
+ "%p (currently in view == %p)",
+ __func__, (void *)gh, (void *)self->gh);
+ return;
+ }
+ else {
+ update_gui_data (self);
+ }
+}
+
/* ACTIONS */
#define DIALOG_SET_SHOW_TEMPLATE(WIDGET, SETUP_FUNC, PROP_ARR_ENTRY) \
@@ -1391,6 +1424,8 @@ ghex_application_window_class_init(GHexApplicationWindowClass *klass)
/*
* for i in `cat tmp.txt`; do echo "gtk_widget_class_bind_template_child (widget_class,
GHexApplicationWindow, ${i});"; done
*/
+ gtk_widget_class_bind_template_child (widget_class, GHexApplicationWindow,
+ no_doc_label);
gtk_widget_class_bind_template_child (widget_class, GHexApplicationWindow,
hex_notebook);
gtk_widget_class_bind_template_child (widget_class, GHexApplicationWindow,
diff --git a/src/ghex-application-window.ui b/src/ghex-application-window.ui
index a9bd6d52..e8b743ae 100644
--- a/src/ghex-application-window.ui
+++ b/src/ghex-application-window.ui
@@ -144,10 +144,23 @@
<object class="GtkBox"> <!-- main vert gtkbox -->
<property name="orientation">vertical</property>
- <child> <!-- child_box for notebook -->
+ <child> <!-- child_box for notebook & content area -->
<object class="GtkBox" id="child_box">
<property name="orientation">horizontal</property>
<property name="homogeneous">false</property>
+ <property name="vexpand">true</property>
+ <property name="hexpand">true</property>
+
+ <child> <!-- label showing no doc loaded -->
+ <object class="GtkLabel" id="no_doc_label">
+ <property name="use-markup">true</property>
+ <property name="label"
translatable="yes"><big><i>No file loaded.</i></big></property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="hexpand">true</property>
+ <property name="vexpand">true</property>
+ </object>
+ </child> <!-- label showing no doc loaded -->
<child> <!-- hex_notebook - tabs for GtkHex widget -->
<object class="GtkNotebook" id="hex_notebook">
@@ -155,8 +168,12 @@
<property name="group-name">hex</property>
<property name="scrollable">true</property>
<property name="vexpand">true</property>
+ <property name="hexpand">true</property>
+ <!-- invisible by default to show the
no_doc_label -->
+ <property name="visible">false</property>
</object>
- </child>
+ </child> <!-- hex_notebook -->
+
</object> <!-- child_box -->
</child> <!-- child_box -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
