changed to pool/nopool setup

no concat anymore


git-svn-id: https://svn.helsinki.at/rhimport/trunk@19 7c65635b-ec39-4f67-a626-873dbafdd612

1 files changed, 33 insertions, 22 deletions

diff --git a/rhimport.glade b/rhimport.glade
index 16e83bc..a4d6503 100644
--- a/rhimport.glade
+++ b/rhimport.glade
@@ -28,20 +28,22 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">4</property>
                 <child>
-                  <widget class="GtkLabel" id="l_dropbox">
+                  <widget class="GtkHSeparator" id="hseparator">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label">&lt;b&gt;Dropbox&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="padding">5</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="co_dropbox">
+                  <widget class="GtkLabel" id="l_dropbox">
                     <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="label">&lt;b&gt;Dropbox&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -49,11 +51,8 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="l_playlist">
+                  <widget class="GtkComboBox" id="co_dropbox">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label">&lt;b&gt;Playlist&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -61,25 +60,26 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFileChooserWidget" id="filechooser">
+                  <widget class="GtkCheckButton" id="cb_pool">
+                    <property name="label" translatable="yes">Musik Pool</property>
                     <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="use_preview_label">False</property>
-                    <property name="preview_widget_active">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="xalign">0.46000000834465027</property>
+                    <property name="draw_indicator">True</property>
+                    <signal name="toggled" handler="on_cb_pool_toggled"/>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_concat">
-                    <property name="label" translatable="yes">Musikdateien zusammenf&#xFC;gen</property>
+                  <widget class="GtkLabel" id="l_file_playlist">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="xalign">0.46000000834465027</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="label">&lt;b&gt;File&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -87,13 +87,24 @@
                   </packing>
                 </child>
                 <child>
+                  <widget class="GtkFileChooserWidget" id="filechooser">
+                    <property name="visible">True</property>
+                    <property name="orientation">vertical</property>
+                    <property name="preview_widget_active">False</property>
+                    <property name="use_preview_label">False</property>
+                  </widget>
+                  <packing>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
                   <widget class="GtkProgressBar" id="progressbar">
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">5</property>
+                    <property name="position">6</property>
                   </packing>
                 </child>
                 <child>
@@ -140,7 +151,7 @@
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="position">6</property>
+                    <property name="position">7</property>
                   </packing>
                 </child>
               </widget>