← Back to branch summary

~ubuntu-branches/debian/sid/gmtp/sid

« back to all changes in this revision

Viewing changes to src/interface.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2011-08-04 09:57:56 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110804095756-6dlvgrw3azr7x61t
Tags: 1.2.0-1
* New upstream release:
  - New features:
    + Import/export *.m3u playlist files from within the playlist editor.
    + Download entire folders from the MTP device to your local PC.
  - Other changes:
    + Disable upload of .PLA or .ALB files as these map directly to
      Playlists and Album metadata pointers on the device. (Allowing this
      may result in corrupt metadata on the device).
* debian/{control,copyright,watch):
  - Upstream moved to SourceForge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface.c
110
110
GtkWidget *checkbuttonConfirmFileOp;
111
111
GtkWidget *checkbuttonConfirmOverWriteFileOp;
112
112
GtkWidget *checkbuttonAutoAddTrackPlaylist;
 
113
GtkWidget *checkbuttonIgnorePathInPlaylist;
113
114
 
114
115
// Widget for Progress Bar Dialog box.
115
116
GtkWidget *progressDialog;
155
156
 
156
157
// Buttons for playlist
157
158
GtkWidget *button_Del_Playlist;
 
159
GtkWidget *button_Export_Playlist;
158
160
GtkWidget *button_File_Move_Up;
159
161
GtkWidget *button_File_Move_Down;
160
162
GtkWidget *button_Del_File;
1318
1320
        } else {
1319
1321
            filesDownload(filename, objectID);
1320
1322
        }
 
1323
    } else {
 
1324
        // Overwrite critera performed within this call...
 
1325
        folderDownload(filename, objectID, TRUE);
1321
1326
    }
1322
1327
    g_free(filename);
1323
1328
    g_free(fullfilename);
1529
1534
    GtkWidget *frame3;
1530
1535
    GtkWidget *alignment3;
1531
1536
    GtkWidget *alignment4;
 
1537
    GtkWidget *labelPlaylist;
 
1538
    GtkWidget *frame4;
1532
1539
    GtkWidget *alignment5;
 
1540
    GtkWidget *alignment6;
 
1541
    GtkWidget *vbox4;
1533
1542
    GtkWidget *vbox2;
1534
1543
 
1535
1544
    GtkWidget *labelDevice;
1600
1609
    gtk_container_add(GTK_CONTAINER(vbox2), alignment4);
1601
1610
    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment4), 0, 0, 12, 0);
1602
1611
 
1603
 
    alignment5 = gtk_alignment_new(0.5, 0.5, 1, 1);
1604
 
    gtk_widget_show(alignment5);
1605
 
    gtk_container_add(GTK_CONTAINER(vbox2), alignment5);
1606
 
    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment5), 0, 0, 12, 0);
1607
 
 
1608
1612
    checkbuttonConfirmFileOp = gtk_check_button_new_with_mnemonic(_("Confirm File/Folder Delete"));
1609
1613
    gtk_widget_show(checkbuttonConfirmFileOp);
1610
1614
    gtk_container_add(GTK_CONTAINER(alignment3), checkbuttonConfirmFileOp);
1613
1617
    gtk_widget_show(checkbuttonConfirmOverWriteFileOp);
1614
1618
    gtk_container_add(GTK_CONTAINER(alignment4), checkbuttonConfirmOverWriteFileOp);
1615
1619
 
 
1620
    // Playlist Frame.
 
1621
 
 
1622
    frame4 = gtk_frame_new(NULL);
 
1623
    gtk_widget_show(frame4);
 
1624
    gtk_box_pack_start(GTK_BOX(vbox1), frame4, TRUE, TRUE, 0);
 
1625
    gtk_frame_set_shadow_type(GTK_FRAME(frame4), GTK_SHADOW_NONE);
 
1626
 
 
1627
    labelPlaylist = gtk_label_new(_("<b>Playlist</b>"));
 
1628
    gtk_widget_show(labelPlaylist);
 
1629
    gtk_frame_set_label_widget(GTK_FRAME(frame4), labelPlaylist);
 
1630
    gtk_label_set_use_markup(GTK_LABEL(labelPlaylist), TRUE);
 
1631
 
 
1632
    vbox4 = gtk_vbox_new(FALSE, 5);
 
1633
    gtk_widget_show(vbox4);
 
1634
    gtk_container_add(GTK_CONTAINER(frame4), vbox4);
 
1635
    
 
1636
    alignment5 = gtk_alignment_new(0.5, 0.5, 1, 1);
 
1637
    gtk_widget_show(alignment5);
 
1638
    gtk_container_add(GTK_CONTAINER(vbox4), alignment5);
 
1639
    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment5), 0, 0, 12, 0);
 
1640
 
 
1641
    alignment6 = gtk_alignment_new(0.5, 0.5, 1, 1);
 
1642
    gtk_widget_show(alignment6);
 
1643
    gtk_container_add(GTK_CONTAINER(vbox4), alignment6);
 
1644
    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment6), 0, 0, 12, 0);
 
1645
 
1616
1646
    checkbuttonAutoAddTrackPlaylist = gtk_check_button_new_with_mnemonic(_("Prompt to add New Music track to existing playlist"));
1617
1647
    gtk_widget_show(checkbuttonAutoAddTrackPlaylist);
1618
1648
    gtk_container_add(GTK_CONTAINER(alignment5), checkbuttonAutoAddTrackPlaylist);
1619
1649
 
 
1650
    checkbuttonIgnorePathInPlaylist = gtk_check_button_new_with_mnemonic(_("Ignore path information when importing playlist"));
 
1651
    gtk_widget_show(checkbuttonIgnorePathInPlaylist);
 
1652
    gtk_container_add(GTK_CONTAINER(alignment6), checkbuttonIgnorePathInPlaylist);
 
1653
 
1620
1654
    labelDevice = gtk_label_new(_("<b>File Operations</b>"));
1621
1655
    gtk_widget_show(labelDevice);
1622
1656
    gtk_frame_set_label_widget(GTK_FRAME(frame3), labelDevice);
1726
1760
        G_CALLBACK(on_PrefsAutoAddTrackPlaylist_activate),
1727
1761
        NULL);
1728
1762
 
 
1763
    g_signal_connect((gpointer) checkbuttonIgnorePathInPlaylist, "toggled",
 
1764
        G_CALLBACK(on_PrefsIgnorePathInPlaylist_activate),
 
1765
        NULL);
 
1766
 
1729
1767
    g_signal_connect((gpointer) checkbuttonDownloadPath, "toggled",
1730
1768
        G_CALLBACK(on_PrefsAskDownload_activate),
1731
1769
        NULL);
1745
1783
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbuttonConfirmFileOp), Preferences.confirm_file_delete_op);
1746
1784
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbuttonConfirmOverWriteFileOp), Preferences.prompt_overwrite_file_op);
1747
1785
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbuttonAutoAddTrackPlaylist), Preferences.auto_add_track_to_playlist);
 
1786
    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbuttonIgnorePathInPlaylist), Preferences.ignore_path_in_playlist_import);
1748
1787
    gtk_entry_set_text(GTK_ENTRY(entryDownloadPath), Preferences.fileSystemDownloadPath->str);
1749
1788
    gtk_entry_set_text(GTK_ENTRY(entryUploadPath), Preferences.fileSystemUploadPath->str);
1750
1789
 
2387
2426
 * Display the About Dialog Box.
2388
2427
 */
2389
2428
void displayAbout(void) {
2390
 
    GtkWidget *dialog, *vbox, *label, *label2, *label3, *label4, *image;
 
2429
    GtkWidget *dialog, *vbox, *label, *label2, *label3, *label4, *label5, *image;
2391
2430
    gchar *version_string;
2392
2431
    gchar *gtk_version_string;
2393
2432
 
2429
2468
    gtk_widget_show(label2);
2430
2469
    gtk_container_add(GTK_CONTAINER(vbox), label2);
2431
2470
 
 
2471
    label5 = gtk_label_new("http://gmtp.sourceforge.net\n");
 
2472
    gtk_label_set_use_markup(GTK_LABEL(label5), TRUE);
 
2473
    gtk_widget_show(label5);
 
2474
    gtk_container_add(GTK_CONTAINER(vbox), label5);
 
2475
 
2432
2476
    label3 = gtk_label_new(_("<small>Copyright 2009-2011, Darran Kartaschew\nReleased under the BSD Licence</small>"));
2433
2477
    gtk_label_set_use_markup(GTK_LABEL(label3), TRUE);
2434
2478
    gtk_widget_show(label3);
3155
3199
    GtkWidget *label_Playlist;
3156
3200
 
3157
3201
    GtkWidget *button_Add_Playlist;
 
3202
    GtkWidget *button_Import_Playlist;
3158
3203
    GtkWidget *alignment2;
3159
3204
    GtkWidget *hbox3;
3160
3205
    GtkWidget *image2;
3277
3322
    gtk_widget_show(label2);
3278
3323
    gtk_box_pack_start(GTK_BOX(hbox2), label2, FALSE, FALSE, 0);
3279
3324
 
 
3325
    // Import Button
 
3326
 
 
3327
    button_Import_Playlist = gtk_button_new_from_stock(GTK_STOCK_OPEN);
 
3328
    gtk_widget_show(button_Import_Playlist);
 
3329
    gtk_box_pack_start(GTK_BOX(hbox1), button_Import_Playlist, FALSE, FALSE, 0);
 
3330
    gtk_container_set_border_width(GTK_CONTAINER(button_Import_Playlist), 5);
 
3331
#if GMTP_USE_GTK2
 
3332
    gtk_tooltips_set_tip(tooltips, button_Import_Playlist, _("Import Playlist"), NULL);
 
3333
#else
 
3334
    gtk_widget_set_tooltip_text(button_Import_Playlist, _("Import Playlist"));
 
3335
#endif
 
3336
 
 
3337
    // Export Button
 
3338
 
 
3339
    button_Export_Playlist = gtk_button_new_from_stock(GTK_STOCK_SAVE_AS);
 
3340
    gtk_widget_show(button_Export_Playlist);
 
3341
    gtk_box_pack_start(GTK_BOX(hbox1), button_Export_Playlist, FALSE, FALSE, 0);
 
3342
    gtk_container_set_border_width(GTK_CONTAINER(button_Export_Playlist), 5);
 
3343
#if GMTP_USE_GTK2
 
3344
    gtk_tooltips_set_tip(tooltips, button_Export_Playlist, _("Export Playlist"), NULL);
 
3345
#else
 
3346
    gtk_widget_set_tooltip_text(button_Export_Playlist, _("Export Playlist"));
 
3347
#endif
 
3348
 
 
3349
    // Scrolled Window.
 
3350
 
3280
3351
    hbox4 = gtk_hbox_new(FALSE, 5);
3281
3352
    gtk_widget_show(hbox4);
3282
3353
    gtk_box_pack_start(GTK_BOX(vbox1), hbox4, TRUE, TRUE, 0);
3427
3498
        G_CALLBACK(on_Playlist_NewPlaylistButton_activate),
3428
3499
        NULL);
3429
3500
 
 
3501
    g_signal_connect((gpointer) button_Import_Playlist, "clicked",
 
3502
        G_CALLBACK(on_Playlist_ImportPlaylistButton_activate),
 
3503
        NULL);
 
3504
 
 
3505
    g_signal_connect((gpointer) button_Export_Playlist, "clicked",
 
3506
        G_CALLBACK(on_Playlist_ExportPlaylistButton_activate),
 
3507
        NULL);
 
3508
 
3430
3509
    g_signal_connect((gpointer) button_Del_Playlist, "clicked",
3431
3510
        G_CALLBACK(on_Playlist_DelPlaylistButton_activate),
3432
3511
        NULL);
3635
3714
 */
3636
3715
void SetPlaylistButtonState(gboolean state) {
3637
3716
    gtk_widget_set_sensitive(GTK_WIDGET(button_Del_Playlist), state);
 
3717
    gtk_widget_set_sensitive(GTK_WIDGET(button_Export_Playlist), state);
3638
3718
    gtk_widget_set_sensitive(GTK_WIDGET(button_File_Move_Up), state);
3639
3719
    gtk_widget_set_sensitive(GTK_WIDGET(button_File_Move_Down), state);
3640
3720
    gtk_widget_set_sensitive(GTK_WIDGET(button_Del_File), state);