Changeset 844

Timestamp:

09/01/09 11:05:47 (4 years ago)

Author:

bruno

Message:

Correct interaction with tracks

File:

• projects/CDDBeditor/bin/CDDBeditor (modified) (9 diffs)

projects/CDDBeditor/bin/CDDBeditor

@@ -18 +18 @@
 use Mail::Sendmail;
 use POSIX  qw(strftime :sys_wait_h);
-use Newt qw(NEWT_FLAG_WRAP :entry :textbox :macros);
+use Newt qw(NEWT_FLAG_WRAP NEWT_ENTRY_SCROLL NEWT_ANCHOR_LEFT :entry :textbox :macros);
 use lib qw (lib);
 use locale;
@@ -161 +161 @@
 my $dev_label = Newt::Label("Device: ");
 my $proxy_label = Newt::Label("Proxy: ");
-my $user_label = Newt::Label("Multiple CD proposal: ");
+my $user_label = Newt::Label("Multi CD: ");
 
 my $wait_label = Newt::Label("Please wait while searching ...");
@@ -211 +211 @@
 
 my $ce_panel = Newt::Panel(2, 20, "CDDBeditor Configuration");
+my $flage = NEWT_ANCHOR_LEFT;
 $ce_panel->Add(0, 0, $host_label);
-$ce_panel->Add(1, 0, $host_entry);
+$ce_panel->Add(1, 0, $host_entry, $flage);
 $ce_panel->Add(0, 1, $port_label);
-$ce_panel->Add(1, 1, $port_entry);
+$ce_panel->Add(1, 1, $port_entry, $flage);
 $ce_panel->Add(0, 2, $mode_label);
-$ce_panel->Add(1, 2, $mode_group);
+$ce_panel->Add(1, 2, $mode_group, $flage);
 $ce_panel->Add(0, 3, $proxy_label);
-$ce_panel->Add(1, 3, $proxy_entry);
+$ce_panel->Add(1, 3, $proxy_entry, $flage);
 $ce_panel->Add(0, 4, $dev_label);
-$ce_panel->Add(1, 4, $dev_entry);
+$ce_panel->Add(1, 4, $dev_entry, $flage);
 $ce_panel->Add(0, 5, $user_label);
-$ce_panel->Add(1, 5, $user_group);
+$ce_panel->Add(1, 5, $user_group, $flage);
 $ce_panel->Add(0, 6, $next_button);
 $ce_panel->Add(1, 6, $quit_button);
 
+Newt::Refresh();
 my ($reason, $data) = $ce_panel->Run();
-Newt::Refresh();
+
 Newt::Cls();
-
 exit 0 if ($data->Tag() eq "Quit");
 
@@ -248 +249 @@
 for (my $i=0 ; ; $i++) {
     # Second panel to make user wait
+    Newt::Cls();
     Newt::DrawRootText(ce_center_string($ce_title), 1, $ce_title);
     Newt::PushHelpLine($ce_help);
     $ce_panel = Newt::Panel(3, 20, "CDDB Search");
     $ce_panel->Add(0, 0, $wait_label);
+
+    Newt::Refresh();
     ($reason, $data) = $ce_panel->Draw();
 
     # CDDB query
     my %ce_cd = get_cddb(\%ce_config);
-
-    Newt::Refresh();
-    Newt::Cls();
 
     # Third panel to display CD Infos
@@ -271 +272 @@
     my $category_entry = Newt::Entry($width, $flag, $ce_cd{cat});
     my $genre_entry = Newt::Entry($width, $flag, $ce_cd{genre});
-    my $data_entry = Newt::Entry($width, $flag, Dumper($ce_cd{data}));
-    my $raw_entry = Newt::Entry($width, $flag, Dumper($ce_cd{raw}));
+    my $data_entry = Newt::Entry($width, $flag, Dumper(@{$ce_cd{data}}));
+    my $raw_entry = Newt::Entry($width, $flag, Dumper(@{$ce_cd{raw}}));
     my $tno_entry = Newt::Label($ce_cd{tno});
-    $width = 4;
-    $flag = 0;
+    $width = 5;
     my $year_entry = Newt::Entry($width, $flag, $ce_cd{year});
     
@@ -281 +281 @@
     $ce_panel = Newt::Panel(3, $ce_sh, "CDDB Info");
     $ce_panel->Add(0, 0, $artist_label);
-    $ce_panel->Add(1, 0, $artist_entry);
+    $ce_panel->Add(1, 0, $artist_entry, $flage);
     $ce_panel->Add(0, 1, $title_label);
-    $ce_panel->Add(1, 1, $title_entry);
+    $ce_panel->Add(1, 1, $title_entry, $flage);
     $ce_panel->Add(0, 2, $year_label);
-    $ce_panel->Add(1, 2, $year_entry);
+    $ce_panel->Add(1, 2, $year_entry, $flage);
     $ce_panel->Add(0, 3, $category_label);
-    $ce_panel->Add(1, 3, $category_entry);
+    $ce_panel->Add(1, 3, $category_entry, $flage);
     $ce_panel->Add(0, 4, $genre_label);
-    $ce_panel->Add(1, 4, $genre_entry);
+    $ce_panel->Add(1, 4, $genre_entry, $flage);
     $ce_panel->Add(0, 5, $data_label);
-    $ce_panel->Add(1, 5, $data_entry);
+    $ce_panel->Add(1, 5, $data_entry, $flage);
     $ce_panel->Add(0, 6, $raw_label);
-    $ce_panel->Add(1, 6, $raw_entry);
+    $ce_panel->Add(1, 6, $raw_entry, $flage);
     $ce_panel->Add(0, 7, $tno_label);
-    $ce_panel->Add(1, 7, $tno_entry);
+    $ce_panel->Add(1, 7, $tno_entry, $flage);
     #$ce_panel->Add(0, 5, $info_label);
-    #$ce_panel->Add(1, 5, $info_entry);
+    #$ce_panel->Add(1, 5, $info_entry, $flage);
 
     my $n=1;
@@ -311 +311 @@
         my $tr = sprintf "Track %2d:", $n;
         my $track_label = Newt::Label($tr);
-        $tr = sprintf "%2d':%.2d", $min, $sec;
+        $tr = sprintf " %2d':%.2d", $min, $sec;
         my $dur_label = Newt::Label($tr);
         $flag = NEWT_FLAG_WRAP|NEWT_ENTRY_SCROLL;
-        my $track_entry = Newt::Entry($width, $flag, Dumper($ce_cd{track}));
+        my $track_entry = Newt::Entry($width, $flag, $ce_cd{track}[$n-1]);
         $ce_panel->Add(0, 8+$n, $track_label);
-        $ce_panel->Add(1, 8+$n, $dur_label);
-        $ce_panel->Add(2, 8+$n, $track_entry);
+        $ce_panel->Add(1, 8+$n, $track_entry, $flage);
+        $ce_panel->Add(2, 8+$n, $dur_label, $flage);
         $n++;
     }
@@ -325 +325 @@
     $ce_panel->Add(2, 8+$n, $quit_button);
     
+    Newt::Cls();
+    Newt::Refresh();
     # Build interface
     ($reason, $data) = $ce_panel->Run();
@@ -347 +349 @@
         Newt::PushHelpLine($ce_help);
 
+        Newt::Cls();
         $ce_panel = Newt::Panel(3, $width, "CDDB Sending Infos");
         $ce_panel->Add(0, 0, $wait_label);
         $ce_panel->Add(0, 1, $info_tb);
         $ce_panel->Add(0, 2, $quit_button);
+        Newt::Refresh();
         ($reason, $data) = $ce_panel->Run();
-        Newt::Refresh();
-        Newt::Cls();
     }
 }