Changeset 327


Ignore:
Timestamp:
Jun 11, 2006, 5:04:27 AM (16 years ago)
Author:
joshe
Message:

Remove the separate preference option for files added via drag-and-drop

and use the "standard" option.

Location:
trunk/gtk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/gtk/conf.h

    r320 r327  
    6262#define PREF_DIR                "download-directory"
    6363#define PREF_ADDSTD             "add-behavior-standard"
    64 #define PREF_ADDDND             "add-behavior-dnd"
    6564#define PREF_ADDIPC             "add-behavior-ipc"
    6665
  • trunk/gtk/dialogs.c

    r320 r327  
    177177   GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
    178178   GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
    179   const unsigned int rowcount = 9;
     179  const unsigned int rowcount = 8;
    180180  GtkWidget *table = gtk_table_new(rowcount, 2, FALSE);
    181181  GtkWidget *portnum = gtk_spin_button_new_with_range(1, 0xffff, 1);
     
    184184    GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
    185185  GtkWidget *addstd = gtk_combo_box_new();
    186   GtkWidget *adddnd = gtk_combo_box_new();
    187186  GtkWidget *addipc = gtk_combo_box_new();
    188187  GtkWidget *label;
     
    216215
    217216  data->prefwidgets = makeglist(portnum, lim[0].on, lim[0].num, lim[1].on,
    218     lim[1].num, dirstr, addstd, adddnd, addipc, NULL);
     217    lim[1].num, dirstr, addstd, addipc, NULL);
    219218  data->parent = parent;
    220219  data->back = back;
     
    288287  ii++;
    289288
    290   /* dnd */
    291   label = gtk_label_new_with_mnemonic(_("For torrents dra_gged and dropped:"));
    292   gtk_label_set_mnemonic_widget(GTK_LABEL(label), adddnd);
    293   gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
    294   gtk_combo_box_set_model(GTK_COMBO_BOX(adddnd), model);
    295   rend = gtk_cell_renderer_text_new();
    296   gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(adddnd), rend, TRUE);
    297   gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(adddnd), rend, "text", 0);
    298   setupprefwidget(adddnd, PREF_ADDDND);
    299   gtk_table_attach_defaults(GTK_TABLE(table), label,           0, 1, RN(ii));
    300   gtk_table_attach_defaults(GTK_TABLE(table), adddnd,          1, 2, RN(ii));
    301   ii++;
    302 
    303289  /* ipc */
    304290  label = gtk_label_new_with_mnemonic(
    305     _("For torrents added e_xternally:"));
     291    _("For torrents added e_xternally\n(via the command-line):"));
    306292  gtk_label_set_mnemonic_widget(GTK_LABEL(label), addipc);
    307293  gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
  • trunk/gtk/main.c

    r320 r327  
    594594    if(NULL != paths) {
    595595      addtorrents(data, NULL, paths, NULL,
    596                   addactionflag(cf_getpref(PREF_ADDDND)));
     596                  addactionflag(cf_getpref(PREF_ADDSTD)));
    597597      freestrlist(paths);
    598598    }
Note: See TracChangeset for help on using the changeset viewer.