GNOME.org
 

[hotssh] prefs: Add (unimplemented) option to match system terminal

commit 97c43443170435998e90f8f12e4a630738ca638f
Author: Colin Walters <walters verbum org>
Date:   Tue Nov 12 08:42:36 2013 -0500

    prefs: Add (unimplemented) option to match system terminal
    
    Will dive into gnome-terminal profiles later...

 src/hotssh-prefs.c               |   13 ++----
 src/hotssh-tab.c                 |    3 +
 src/org.gnome.hotssh.gschema.xml |   23 ++-------
 src/prefs.ui                     |   97 ++++++++++++++++++++-----------------
 4 files changed, 63 insertions(+), 73 deletions(-)
---
diff --git a/src/hotssh-prefs.c b/src/hotssh-prefs.c
index 8c1226f..2acca7a 100644
--- a/src/hotssh-prefs.c
+++ b/src/hotssh-prefs.c
@@ -39,8 +39,7 @@ typedef struct _HotSshPrefsPrivate HotSshPrefsPrivate;
 struct _HotSshPrefsPrivate
 {
   GSettings *settings;
-  GtkWidget *font;
-  GtkWidget *transition;
+  GtkWidget *match_system_terminal_style;
 };
 
 G_DEFINE_TYPE_WITH_PRIVATE(HotSshPrefs, hotssh_prefs, GTK_TYPE_DIALOG)
@@ -60,11 +59,8 @@ hotssh_prefs_init (HotSshPrefs *prefs)
   gtk_widget_init_template (GTK_WIDGET (prefs));
   priv->settings = g_settings_new ("org.gnome.hotssh");
 
-  g_settings_bind (priv->settings, "font",
-                   priv->font, "font",
-                   G_SETTINGS_BIND_DEFAULT);
-  g_settings_bind (priv->settings, "transition",
-                   priv->transition, "active-id",
+  g_settings_bind (priv->settings, "match-system-terminal-style",
+                   priv->match_system_terminal_style, "active",
                    G_SETTINGS_BIND_DEFAULT);
 }
 
@@ -86,8 +82,7 @@ hotssh_prefs_class_init (HotSshPrefsClass *class)
 
   gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                                "/org/gnome/hotssh/prefs.ui");
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), HotSshPrefs, font);
-  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), HotSshPrefs, transition);
+  gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (class), HotSshPrefs, 
match_system_terminal_style);
 
   gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), preferences_closed);
 }
diff --git a/src/hotssh-tab.c b/src/hotssh-tab.c
index 49e0fb0..3b98990 100644
--- a/src/hotssh-tab.c
+++ b/src/hotssh-tab.c
@@ -48,6 +48,7 @@ typedef enum {
 
 struct _HotSshTabPrivate
 {
+  GSettings *settings;
   GtkWidget *terminal;
 
   /* Bound via template */
@@ -550,6 +551,8 @@ hotssh_tab_init (HotSshTab *self)
 {
   HotSshTabPrivate *priv = hotssh_tab_get_instance_private (self);
 
+  priv->settings = g_settings_new ("org.gnome.hotssh");
+
   gtk_widget_init_template (GTK_WIDGET (self));
 
   g_signal_connect (priv->connect_button, "clicked", G_CALLBACK (on_connect), self);
diff --git a/src/org.gnome.hotssh.gschema.xml b/src/org.gnome.hotssh.gschema.xml
index 4ede234..09d46bf 100644
--- a/src/org.gnome.hotssh.gschema.xml
+++ b/src/org.gnome.hotssh.gschema.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
   <schema path="/org/gnome/hotssh/" id="org.gnome.hotssh">
-    <key name="font" type="s">
-      <default>'Monospace 12'</default>
-      <summary>Font</summary>
-      <description>The font to be used for content.</description>
-    </key>
-    <key name="transition" type="s">
-      <choices>
-        <choice value='none'/>
-        <choice value='crossfade'/>
-        <choice value='slide-left-right'/>
-      </choices>
-      <default>'none'</default>
-      <summary>Transition</summary>
-      <description>The transition to use when switching tabs.</description>
-    </key>
-    <key name="show-words" type="b">
-      <default>false</default>
-      <summary>Show words</summary>
-      <description>Whether to show a word list in the sidebar</description>
+    <key name="match-system-terminal-style" type="b">
+      <default>true</default>
+      <summary>Match System Terminal style</summary>
+      <description>Match colors, font, etc. with system Terminal application.</description>
     </key>
   </schema>
 </schemalist>
diff --git a/src/prefs.ui b/src/prefs.ui
index fe70059..1984234 100644
--- a/src/prefs.ui
+++ b/src/prefs.ui
@@ -1,81 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Tue Nov 12 08:42:15 2013 -->
 <interface>
   <!-- interface-requires gtk+ 3.8 -->
   <template class="HotSshPrefs" parent="GtkDialog">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
+    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="vbox">
-        <child>
-          <object class="GtkGrid" id="grid">
+        <property name="can_focus">False</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="action_area">
             <property name="visible">True</property>
-            <property name="margin">6</property>
-            <property name="row-spacing">12</property>
-            <property name="column-spacing">6</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkLabel" id="fontlabel">
-                <property name="visible">True</property>
-                <property name="label">_Font:</property>
-                <property name="use-underline">True</property>
-                <property name="mnemonic-widget">font</property>
-                <property name="xalign">1</property>
-              </object>
-              <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFontButton" id="font">
+              <object class="GtkButton" id="close">
+                <property name="label">_Close</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="preferences_closed" swapped="no"/>
               </object>
               <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">12</property>
+            <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="transitionlabel">
                 <property name="visible">True</property>
-                <property name="label">_Transition:</property>
-                <property name="use-underline">True</property>
-                <property name="mnemonic-widget">transition</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">1</property>
+                <property name="label">_Match System Terminal style:</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="left-attach">0</property>
-                <property name="top-attach">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="transition">
+              <object class="GtkSwitch" id="match_system_terminal_style">
                 <property name="visible">True</property>
-                <items>
-                  <item translatable="yes" id="none">None</item>
-                  <item translatable="yes" id="crossfade">Fade</item>
-                  <item translatable="yes" id="slide-left-right">Slide</item>
-                </items>
+                <property name="can_focus">True</property>
               </object>
               <packing>
-                <property name="left-attach">1</property>
-                <property name="top-attach">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
-          </object>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="action_area">
-            <property name="visible">True</property>
             <child>
-              <object class="GtkButton" id="close">
-                <signal name="clicked" handler="preferences_closed"/>
-                <property name="visible">True</property>
-                <property name="label">_Close</property>
-                <property name="use-underline">True</property>
-              </object>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]