From 8d5d70c23c55946570e618d708673b8921e29f68 Mon Sep 17 00:00:00 2001
From: Zach Tibbitts <zach@collegegeek.org>
Date: Wed, 21 Feb 2007 18:30:27 +0000
Subject: [PATCH] pref, plugin, and remove dlgs skip taskbar

---
 glade/dgtkpopups.glade |   5 +-
 glade/dgtkpref.glade   | 382 +++++++++++++++++++++--------------------
 2 files changed, 198 insertions(+), 189 deletions(-)

diff --git a/glade/dgtkpopups.glade b/glade/dgtkpopups.glade
index 53ff4606a..f57f5f027 100644
--- a/glade/dgtkpopups.glade
+++ b/glade/dgtkpopups.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.1.5 on Tue Feb 20 20:31:43 2007 by zach@notapowerbook-->
+<!--Generated with glade3 3.1.5 on Wed Feb 21 13:25:40 2007 by zach@notapowerbook-->
 <glade-interface>
   <widget class="GtkMenu" id="torrent_popup">
     <property name="visible">True</property>
@@ -79,7 +79,10 @@
   </widget>
   <widget class="GtkDialog" id="remove_torrent_dlg">
     <property name="title" translatable="yes">Remove Torrent</property>
+    <property name="destroy_with_parent">True</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox3">
diff --git a/glade/dgtkpref.glade b/glade/dgtkpref.glade
index 18e1810b7..1fe9ba45a 100644
--- a/glade/dgtkpref.glade
+++ b/glade/dgtkpref.glade
@@ -8,6 +8,9 @@
     <property name="title" translatable="yes">Preferences Dialog</property>
     <property name="default_width">583</property>
     <property name="default_height">431</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox1">
@@ -44,6 +47,18 @@
                                 <child>
                                   <placeholder/>
                                 </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="chk_use_tray">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Enable system tray icon</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="tray_toggle"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <widget class="GtkCheckButton" id="chk_min_on_close">
                                     <property name="visible">True</property>
@@ -57,18 +72,6 @@
                                     <property name="x_padding">12</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <widget class="GtkCheckButton" id="chk_use_tray">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Enable system tray icon</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="tray_toggle"/>
-                                  </widget>
-                                  <packing>
-                                    <property name="right_attach">2</property>
-                                  </packing>
-                                </child>
                               </widget>
                             </child>
                             <child>
@@ -95,13 +98,15 @@
                                 <property name="n_rows">2</property>
                                 <property name="n_columns">2</property>
                                 <child>
-                                  <widget class="GtkRadioButton" id="radio_ask_save">
+                                  <widget class="GtkFileChooserButton" id="download_path_button">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Ask me where to save each download</property>
-                                    <property name="draw_indicator">True</property>
+                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -117,15 +122,13 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFileChooserButton" id="download_path_button">
+                                  <widget class="GtkRadioButton" id="radio_ask_save">
                                     <property name="visible">True</property>
-                                    <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+                                    <property name="label" translatable="yes">Ask me where to save each download</property>
+                                    <property name="draw_indicator">True</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -154,14 +157,6 @@
                                 <property name="visible">True</property>
                                 <property name="n_rows">1</property>
                                 <property name="n_columns">2</property>
-                                <child>
-                                  <widget class="GtkCheckButton" id="chk_autoseed">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Stop seeding torrents when
-their share ratio reaches:</property>
-                                    <property name="draw_indicator">True</property>
-                                  </widget>
-                                </child>
                                 <child>
                                   <widget class="GtkSpinButton" id="ratio_spinner">
                                     <property name="visible">True</property>
@@ -179,6 +174,14 @@ their share ratio reaches:</property>
                                     <property name="x_options"></property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <widget class="GtkCheckButton" id="chk_autoseed">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Stop seeding torrents when
+their share ratio reaches:</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                </child>
                               </widget>
                             </child>
                             <child>
@@ -272,13 +275,53 @@ their share ratio reaches:</property>
                                   <placeholder/>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="btn_test_port">
+                                  <widget class="GtkLabel" id="label25">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Test Port</property>
+                                    <property name="label" translatable="yes">Try from:</property>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label26">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">to:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="spin_port_min">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="adjustment">0 0 65535 1 10 10</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="spin_port_max">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="adjustment">0 0 65535 1 10 10</property>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label27">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">Active port:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                   </packing>
@@ -296,57 +339,17 @@ their share ratio reaches:</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label27">
+                                  <widget class="GtkButton" id="btn_test_port">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Active port:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_port_max">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="adjustment">0 0 65535 1 10 10</property>
+                                    <property name="label" translatable="yes">Test Port</property>
                                   </widget>
                                   <packing>
                                     <property name="left_attach">3</property>
                                     <property name="right_attach">4</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_port_min">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="adjustment">0 0 65535 1 10 10</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label26">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">to:</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label25">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">Try from:</property>
-                                  </widget>
-                                </child>
                               </widget>
                             </child>
                             <child>
@@ -373,94 +376,62 @@ their share ratio reaches:</property>
                                 <property name="n_rows">5</property>
                                 <property name="n_columns">3</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label4">
+                                  <widget class="GtkLabel" id="label9">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Maximum Upload Rate:</property>
+                                    <property name="label" translatable="yes">&lt;i&gt;(-1 is unlimited)&lt;/i&gt;</property>
+                                    <property name="use_markup">True</property>
                                   </widget>
                                   <packing>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
+                                    <property name="right_attach">3</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label3">
+                                  <widget class="GtkLabel" id="label8">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Upload Slots</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label2">
-                                    <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Maximum Download Rate:</property>
+                                    <property name="label" translatable="yes">KB/s</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
+                                    <property name="x_options"></property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label1">
+                                  <widget class="GtkLabel" id="label7">
                                     <property name="visible">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Maximum number of Downloads:</property>
                                   </widget>
                                   <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label6">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">KB/s</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label5">
+                                    <property name="visible">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="right_attach">3</property>
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_max_upload">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="width_chars">10</property>
-                                    <property name="xalign">1</property>
-                                    <property name="adjustment">0 -1 1024 1 10 10</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_num_upload">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="width_chars">10</property>
-                                    <property name="xalign">1</property>
-                                    <property name="adjustment">0 -1 100 1 10 10</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkSpinButton" id="spin_max_download">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="width_chars">10</property>
-                                    <property name="xalign">1</property>
-                                    <property name="adjustment">0 -1 2048 1 10 10</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="right_attach">2</property>
-                                    <property name="top_attach">3</property>
-                                    <property name="bottom_attach">4</property>
                                     <property name="x_options"></property>
                                   </packing>
                                 </child>
@@ -481,63 +452,95 @@ their share ratio reaches:</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label5">
+                                  <widget class="GtkSpinButton" id="spin_max_download">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="width_chars">10</property>
+                                    <property name="xalign">1</property>
+                                    <property name="adjustment">0 -1 2048 1 10 10</property>
                                   </widget>
                                   <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">4</property>
-                                    <property name="bottom_attach">5</property>
-                                    <property name="x_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label6">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">KB/s</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="bottom_attach">2</property>
-                                    <property name="x_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label7">
-                                    <property name="visible">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="bottom_attach">3</property>
-                                    <property name="x_options"></property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="label" translatable="yes">KB/s</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="left_attach">2</property>
-                                    <property name="right_attach">3</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
                                     <property name="x_options"></property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label9">
+                                  <widget class="GtkSpinButton" id="spin_num_upload">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes">&lt;i&gt;(-1 is unlimited)&lt;/i&gt;</property>
-                                    <property name="use_markup">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="width_chars">10</property>
+                                    <property name="xalign">1</property>
+                                    <property name="adjustment">0 -1 100 1 10 10</property>
                                   </widget>
                                   <packing>
-                                    <property name="right_attach">3</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                    <property name="x_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkSpinButton" id="spin_max_upload">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="width_chars">10</property>
+                                    <property name="xalign">1</property>
+                                    <property name="adjustment">0 -1 1024 1 10 10</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
+                                    <property name="x_options"></property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label1">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Maximum number of Downloads:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label2">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Maximum Download Rate:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">3</property>
+                                    <property name="bottom_attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label3">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Upload Slots</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">2</property>
+                                    <property name="bottom_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label4">
+                                    <property name="visible">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="label" translatable="yes">Maximum Upload Rate:</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="top_attach">1</property>
+                                    <property name="bottom_attach">2</property>
                                   </packing>
                                 </child>
                               </widget>
@@ -625,6 +628,9 @@ their share ratio reaches:</property>
     <property name="title" translatable="yes">Plugin Manager</property>
     <property name="default_width">583</property>
     <property name="default_height">431</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox2">