[gtranslator] Begin implementing new UI design
- From: Seán de Búrca <sdeburca src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtranslator] Begin implementing new UI design
- Date: Tue, 3 Feb 2015 07:52:48 +0000 (UTC)
commit bce4c8417fa55950cb3703429a8d18c025073cd2
Author: Seán de Búrca <leftmostcat gmail com>
Date: Mon Feb 2 23:04:38 2015 -0700
Begin implementing new UI design
src/gtr-window.c | 19 +++++--------------
src/gtr-window.ui | 47 +++++++++++++++++------------------------------
2 files changed, 22 insertions(+), 44 deletions(-)
---
diff --git a/src/gtr-window.c b/src/gtr-window.c
index 12ffdf4..366313e 100644
--- a/src/gtr-window.c
+++ b/src/gtr-window.c
@@ -60,6 +60,8 @@ typedef struct
{
GSettings *state_settings;
+ GtkWidget *header_bar;
+
GtkWidget *main_box;
GtkWidget *notebook;
@@ -459,8 +461,10 @@ init_statusbar (GtrWindow *window)
priv->profile_combo = gtr_status_combo_box_new (_("Profile"));
gtk_widget_set_tooltip_text (priv->profile_combo,
_("Profile for the active document"));
+#if 0
gtk_box_pack_start (GTK_BOX (priv->statusbar),
priv->profile_combo, FALSE, TRUE, 0);
+#endif
g_signal_connect (priv->profile_combo, "changed",
G_CALLBACK (profile_combo_changed), window);
@@ -617,17 +621,6 @@ gtr_window_init (GtrWindow *window)
g_signal_connect (priv->prof_manager, "profile-modified",
G_CALLBACK (on_profile_modified), window);
- /* notebook */
- g_signal_connect (priv->notebook, "switch-page",
- G_CALLBACK (notebook_switch_page), window);
- g_signal_connect (priv->notebook, "page-added",
- G_CALLBACK (notebook_tab_added), window);
- g_signal_connect (priv->notebook, "page-removed",
- G_CALLBACK (notebook_page_removed), window);
- g_signal_connect (priv->notebook,
- "tab_close_request",
- G_CALLBACK (gtr_close_tab), window);
-
/* statusbar & progress bar */
init_statusbar (window);
@@ -723,9 +716,7 @@ gtr_window_class_init (GtrWindowClass *klass)
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass),
"/org/gnome/translator/gtr-window.ui");
- gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GtrWindow, main_box);
- gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GtrWindow, notebook);
- gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GtrWindow, statusbar);
+ gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GtrWindow, header_bar);
}
/***************************** Public funcs ***********************************/
diff --git a/src/gtr-window.ui b/src/gtr-window.ui
index 80aad36..75ab50c 100644
--- a/src/gtr-window.ui
+++ b/src/gtr-window.ui
@@ -2,44 +2,31 @@
<interface>
<requires lib="gtk+" version="3.14"/>
<template class="GtrWindow" parent="GtkApplicationWindow">
- <property name="can_focus">False</property>
- <property name="default_width">800</property>
- <property name="default_height">600</property>
- <property name="height_request">600</property>
- <property name="show_menubar">False</property>
- <child>
- <object class="GtkBox" id="main_box">
+ <property name="can-focus">False</property>
+ <property name="default-width">800</property>
+ <property name="default-height">600</property>
+ <property name="height-request">600</property>
+ <property name="show-menubar">False</property>
+ <child type="titlebar">
+ <object class="GtkHeaderBar" id="header_bar">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can-focus">False</property>
+ <property name="show-close-button">True</property>
<child>
- <object class="GtrNotebook" id="notebook"/>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox">
+ <object class="GtkMenuButton" id="menu_button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtrStatusbar" id="statusbar"/>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="use-popover">True</property>
+ <property name="image">menu_image</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
+ <property name="pack-type">end</property>
</packing>
</child>
</object>
</child>
</template>
+ <object class="GtkImage" id="menu_image">
+ <property name="visible">True</property>
+ <property name="icon-name">open-menu-symbolic</property>
+ </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]