reenabled db stuff

moved to new gui with mode selector


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

1 files changed, 55 insertions, 18 deletions

diff --git a/rhimport.glade b/rhimport.glade
index a4d6503..00ed60e 100644
--- a/rhimport.glade
+++ b/rhimport.glade
@@ -28,31 +28,75 @@
                 <property name="orientation">vertical</property>
                 <property name="spacing">4</property>
                 <child>
-                  <widget class="GtkHSeparator" id="hseparator">
+                  <widget class="GtkHBox" id="hbox_mode">
                     <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="l_dummy_l">
+                        <property name="visible">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkButton" id="b_mode">
+                        <property name="label" translatable="yes">Modus</property>
+                        <property name="width_request">130</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <signal name="clicked" handler="on_b_mode_clicked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="l_mode">
+                        <property name="width_request">120</property>
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">&lt;b&gt;Sendung&lt;/b&gt;</property>
+                        <property name="use_markup">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="l_dummy_r">
+                        <property name="visible">True</property>
+                      </widget>
+                      <packing>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
                   </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="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">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkComboBox" id="co_dropbox">
+                  <widget class="GtkLabel" id="l_dropbox">
                     <property name="visible">True</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>
@@ -60,14 +104,8 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="cb_pool">
-                    <property name="label" translatable="yes">Musik Pool</property>
+                  <widget class="GtkComboBox" id="co_dropbox">
                     <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="draw_indicator">True</property>
-                    <signal name="toggled" handler="on_cb_pool_toggled"/>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -77,8 +115,7 @@
                 <child>
                   <widget class="GtkLabel" id="l_file_playlist">
                     <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="label">&lt;b&gt;File&lt;/b&gt;</property>
+                    <property name="label">&lt;b&gt;Datei&lt;/b&gt;</property>
                     <property name="use_markup">True</property>
                   </widget>
                   <packing>
@@ -90,8 +127,8 @@
                   <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>
+                    <property name="preview_widget_active">False</property>
                   </widget>
                   <packing>
                     <property name="position">5</property>
@@ -108,7 +145,7 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hbox">
+                  <widget class="GtkHBox" id="hbox_button">
                     <property name="visible">True</property>
                     <child>
                       <widget class="GtkLabel" id="l_status">