add the animateIconify option

diff --git a/src/appearance.c b/src/appearance.c
index 61d2228eeff8f4f1ca964e0d1836cbf5450f3b86..293e43f7c90d767e2804a5ad707522926d47c759 100644 (file)
--- a/src/appearance.c
+++ b/src/appearance.c
@@ -38,6 +38,10 @@ void appearance_setup_tab()
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
                                  tree_get_bool("theme/keepBorder", TRUE));
 
+    w = get_widget("animate_iconify");
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
+                                 tree_get_bool("theme/animateIconify", TRUE));
+
     w = get_widget("title_layout");
     layout = tree_get_string("theme/titleLayout", "NLIMC");
     gtk_entry_set_text(GTK_ENTRY(w), layout);
@@ -77,6 +81,16 @@ void on_window_border_toggled(GtkToggleButton *w, gpointer data)
     tree_set_bool("theme/keepBorder", b);
 }
 
+void on_animate_iconify_toggled(GtkToggleButton *w, gpointer data)
+{
+    gboolean b;
+
+    if (mapping) return;
+
+    b = gtk_toggle_button_get_active(w);
+    tree_set_bool("theme/animateIconify", b);
+}
+
 void on_title_layout_changed(GtkEntry *w, gpointer data)
 {
     gchar *layout;

diff --git a/src/obconf.glade b/src/obconf.glade
index d1044086f520ce6aea5938603b2a7343d6b6093a..8d11a90a111052e4130be64745a9239aa2dc1bff 100644 (file)
--- a/src/obconf.glade
+++ b/src/obconf.glade
@@ -420,53 +420,112 @@
                      <property name="spacing">0</property>
 
                      <child>
-                       <widget class="GtkLabel" id="label100">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">    </property>
-                         <property name="use_underline">False</property>
-                         <property name="use_markup">False</property>
-                         <property name="justify">GTK_JUSTIFY_LEFT</property>
-                         <property name="wrap">False</property>
-                         <property name="selectable">False</property>
-                         <property name="xalign">0.5</property>
-                         <property name="yalign">0.5</property>
-                         <property name="xpad">0</property>
-                         <property name="ypad">0</property>
-                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                         <property name="width_chars">-1</property>
-                         <property name="single_line_mode">False</property>
-                         <property name="angle">0</property>
-                       </widget>
-                       <packing>
-                         <property name="padding">0</property>
-                         <property name="expand">False</property>
-                         <property name="fill">False</property>
-                       </packing>
-                     </child>
-
-                     <child>
-                       <widget class="GtkHBox" id="hbox51">
+                       <widget class="GtkVBox" id="vbox69">
                          <property name="visible">True</property>
                          <property name="homogeneous">False</property>
                          <property name="spacing">0</property>
 
                          <child>
-                           <widget class="GtkCheckButton" id="window_border">
+                           <widget class="GtkHBox" id="hbox93">
                              <property name="visible">True</property>
-                             <property name="can_focus">True</property>
-                             <property name="label" translatable="yes">_Windows retain a border when undecorated</property>
-                             <property name="use_underline">True</property>
-                             <property name="relief">GTK_RELIEF_NORMAL</property>
-                             <property name="focus_on_click">True</property>
-                             <property name="active">False</property>
-                             <property name="inconsistent">False</property>
-                             <property name="draw_indicator">True</property>
-                             <signal name="toggled" handler="on_window_border_toggled" after="yes" last_modification_time="Fri, 25 May 2007 16:03:01 GMT"/>
+                             <property name="homogeneous">False</property>
+                             <property name="spacing">0</property>
+
+                             <child>
+                               <widget class="GtkLabel" id="label171">
+                                 <property name="visible">True</property>
+                                 <property name="label" translatable="yes">    </property>
+                                 <property name="use_underline">False</property>
+                                 <property name="use_markup">False</property>
+                                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                                 <property name="wrap">False</property>
+                                 <property name="selectable">False</property>
+                                 <property name="xalign">0.5</property>
+                                 <property name="yalign">0.5</property>
+                                 <property name="xpad">0</property>
+                                 <property name="ypad">0</property>
+                                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                                 <property name="width_chars">-1</property>
+                                 <property name="single_line_mode">False</property>
+                                 <property name="angle">0</property>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+                               </packing>
+                             </child>
+
+                             <child>
+                               <widget class="GtkVBox" id="vbox70">
+                                 <property name="visible">True</property>
+                                 <property name="homogeneous">False</property>
+                                 <property name="spacing">0</property>
+
+                                 <child>
+                                   <widget class="GtkHBox" id="hbox51">
+                                     <property name="visible">True</property>
+                                     <property name="homogeneous">False</property>
+                                     <property name="spacing">0</property>
+
+                                     <child>
+                                       <widget class="GtkCheckButton" id="window_border">
+                                         <property name="visible">True</property>
+                                         <property name="can_focus">True</property>
+                                         <property name="label" translatable="yes">_Windows retain a border when undecorated</property>
+                                         <property name="use_underline">True</property>
+                                         <property name="relief">GTK_RELIEF_NORMAL</property>
+                                         <property name="focus_on_click">True</property>
+                                         <property name="active">False</property>
+                                         <property name="inconsistent">False</property>
+                                         <property name="draw_indicator">True</property>
+                                         <signal name="toggled" handler="on_window_border_toggled" after="yes" last_modification_time="Fri, 25 May 2007 16:03:01 GMT"/>
+                                       </widget>
+                                       <packing>
+                                         <property name="padding">0</property>
+                                         <property name="expand">False</property>
+                                         <property name="fill">False</property>
+                                       </packing>
+                                     </child>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">True</property>
+                                     <property name="fill">True</property>
+                                   </packing>
+                                 </child>
+
+                                 <child>
+                                   <widget class="GtkCheckButton" id="animate_iconify">
+                                     <property name="visible">True</property>
+                                     <property name="can_focus">True</property>
+                                     <property name="label" translatable="yes">Animate _iconify and restore</property>
+                                     <property name="use_underline">True</property>
+                                     <property name="relief">GTK_RELIEF_NORMAL</property>
+                                     <property name="focus_on_click">True</property>
+                                     <property name="active">False</property>
+                                     <property name="inconsistent">False</property>
+                                     <property name="draw_indicator">True</property>
+                                     <signal name="toggled" handler="on_animate_iconify_toggled" after="yes" last_modification_time="Fri, 01 Jun 2007 02:39:24 GMT"/>
+                                   </widget>
+                                   <packing>
+                                     <property name="padding">0</property>
+                                     <property name="expand">False</property>
+                                     <property name="fill">False</property>
+                                   </packing>
+                                 </child>
+                               </widget>
+                               <packing>
+                                 <property name="padding">0</property>
+                                 <property name="expand">True</property>
+                                 <property name="fill">True</property>
+                               </packing>
+                             </child>
                            </widget>
                            <packing>
                              <property name="padding">0</property>
-                             <property name="expand">False</property>
-                             <property name="fill">False</property>
+                             <property name="expand">True</property>
+                             <property name="fill">True</property>
                            </packing>
                          </child>
                        </widget>
@@ -1785,6 +1844,57 @@ C - The close button</property>
                  <property name="fill">True</property>
                </packing>
              </child>
+
+             <child>
+               <widget class="GtkVBox" id="vbox67">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">6</property>
+
+                 <child>
+                   <widget class="GtkHBox" id="hbox92">
+                     <property name="visible">True</property>
+                     <property name="homogeneous">False</property>
+                     <property name="spacing">0</property>
+
+                     <child>
+                       <widget class="GtkLabel" id="label170">
+                         <property name="visible">True</property>
+                         <property name="label" translatable="yes">    </property>
+                         <property name="use_underline">False</property>
+                         <property name="use_markup">False</property>
+                         <property name="justify">GTK_JUSTIFY_LEFT</property>
+                         <property name="wrap">False</property>
+                         <property name="selectable">False</property>
+                         <property name="xalign">0.5</property>
+                         <property name="yalign">0.5</property>
+                         <property name="xpad">0</property>
+                         <property name="ypad">0</property>
+                         <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                         <property name="width_chars">-1</property>
+                         <property name="single_line_mode">False</property>
+                         <property name="angle">0</property>
+                       </widget>
+                       <packing>
+                         <property name="padding">0</property>
+                         <property name="expand">False</property>
+                         <property name="fill">False</property>
+                       </packing>
+                     </child>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">True</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
            </widget>
            <packing>
              <property name="tab_expand">False</property>

diff --git a/src/strings.c b/src/strings.c
index 492c031053e3151c15293ef68566facfd410b398..14f4389b1c06493b23a4c7e4e9f189d4a4dea116 100644 (file)
--- a/src/strings.c
+++ b/src/strings.c
@@ -13,6 +13,7 @@ gchar *s = N_("Theme");
 gchar *s = N_("<span weight=\"bold\">Windows</span>");
 gchar *s = N_("    ");
 gchar *s = N_("_Windows retain a border when undecorated");
+gchar *s = N_("Animate _iconify and restore");
 gchar *s = N_("<span weight=\"bold\">Window Titles</span>");
 gchar *s = N_("    ");
 gchar *s = N_("_Button order:");
@@ -54,6 +55,7 @@ gchar *s = N_("Amount of resistance against other _windows:");
 gchar *s = N_("px");
 gchar *s = N_("Amount of resistance against screen _edges:");
 gchar *s = N_("px");
+gchar *s = N_("    ");
 gchar *s = N_("Windows");
 gchar *s = N_("<span weight=\"bold\">Focusing Windows</span>");
 gchar *s = N_("    ");